X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=kernel-2.6.spec;h=44f6cba21818a50e2cc8d3f91c6e481014d85110;hb=308297552fd3c2578ac905bc1ac0e31ba898643a;hp=93cf8b8c1754bc1431bd4ab9d47e98b005d44c06;hpb=1161816b004eef113896d744df94ffc042d28766;p=linux-2.6.git

diff --git a/kernel-2.6.spec b/kernel-2.6.spec
index 93cf8b8c1..44f6cba21 100644
--- a/kernel-2.6.spec
+++ b/kernel-2.6.spec
@@ -24,7 +24,7 @@ Summary: The Linux kernel (the core of the Linux operating system)
 # for module-tag.py - sublevel is used for the version (middle) part of tag names
 %define name linux-2.6
 %define module_version_varname sublevel
-%define taglevel 29
+%define taglevel 33
 
 #
 # Polite request for people who spin their own kernel rpms:
@@ -181,9 +181,11 @@ Patch630: linux-2.6-630-sched-fix.patch
 Patch640: linux-2.6-640-netlink-audit-hack.patch
 Patch650: linux-2.6-650-hangcheck-reboot.patch
 Patch660: linux-2.6-660-nmi-watchdog-default.patch
-%if "%{distroname}" == "f9"
+%if "%{distroname}" == "f9" || "%{distroname}" == "f10"
 Patch670: linux-2.6-670-gcc43.patch
 %endif
+Patch680: linux-2.6-680-htb-hysteresis-tso.patch
+Patch690: linux-2.6-690-web100.patch
 
 # See also the file named 'sources' here for the related checksums
 # NOTE. iwlwifi should be in-kernel starting from 2.6.24
@@ -390,9 +392,11 @@ KERNEL_PREVIOUS=vanilla
 %ApplyPatch 640
 %ApplyPatch 650
 %ApplyPatch 660
-%if "%{distroname}" == "f9"
+%if "%{distroname}" == "f9" || "%{distroname}" == "f10"
 %ApplyPatch 670
 %endif
+%ApplyPatch 680
+%ApplyPatch 690
 
 
 # NetNS conflict-resolving patch for VINI. Will work with patch vini_pl_patch-1 but may
@@ -855,6 +859,17 @@ rm -f /lib/modules/%{KVERREL}uml/modules.*
 %endif
 
 %changelog
+* Mon Feb 23 2009 Sapan Bhatia <sapanb@cs.princeton.edu> - linux-2.6-22-33
+
+* Thu Jan 08 2009 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - linux-2.6-22-32
+- support building on fedora 10
+
+* Tue Dec 02 2008 Daniel Hokka Zakrisson <daniel@hozac.com> - linux-2.6-22-31
+- add patches for m-lab and drl
+
+* Tue Nov 11 2008 Daniel Hokka Zakrisson <daniel@hozac.com> - linux-2.6-22-30
+- Use Intel's e1000e driver.
+
 * Thu Oct 02 2008 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - linux-2.6-22-29
 - added drivers for OPTION's globetrotter (gt 3g+ emea) umts cards
 - + cleanup outdated configs