X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=kernel-2.6.spec;h=64f04b1d17d7febc9b3e41e5f7c4f5233d7495c8;hb=e3b7329c02763155a1b6617cc75c664b26a09cd7;hp=15f68c29a9fc5e1ad8e3b43974ca7c118c157508;hpb=b0ac13e9d324d46b4e51e9708b202ce104f31054;p=linux-2.6.git

diff --git a/kernel-2.6.spec b/kernel-2.6.spec
index 15f68c29a..64f04b1d1 100644
--- a/kernel-2.6.spec
+++ b/kernel-2.6.spec
@@ -25,7 +25,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 39
+%define taglevel 41
 
 #
 # Polite request for people who spin their own kernel rpms:
@@ -189,7 +189,9 @@ Patch670: linux-2.6-670-gcc43.patch
 %endif
 Patch680: linux-2.6-680-htb-hysteresis-tso.patch
 Patch690: linux-2.6-690-web100.patch
+Patch700: linux-2.6-700-fperm.patch
 Patch710: linux-2.6-710-avoid-64bits-addr-pcmcia.patch
+Patch720: linux-2.6-720-bonding-hashes.patch
 
 # See also the file named 'sources' here for the related checksums
 # NOTE. iwlwifi should be in-kernel starting from 2.6.24
@@ -408,7 +410,9 @@ KERNEL_PREVIOUS=vanilla
 %endif
 %ApplyPatch 680
 %ApplyPatch 690
+%ApplyPatch 700
 %ApplyPatch 710
+%ApplyPatch 720
 
 
 # NetNS conflict-resolving patch for VINI. Will work with patch vini_pl_patch-1 but may
@@ -883,6 +887,12 @@ rm -f /lib/modules/%{KVERREL}uml/modules.*
 %endif
 
 %changelog
+* Thu Jun 11 2009 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - linux-2.6-22-41
+- configs for the embedemu pldistro
+
+* Wed Jun 03 2009 Sapan Bhatia <sapanb@cs.princeton.edu> - linux-2.6-22-40
+- Added patch 700, which implements VXC_PROC_WRITE support
+
 * Tue May 26 2009 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - linux-2.6-22-39
 - outputs the kernel-headers rpm as backported from 2.6.27