X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=kernel-2.6.spec;h=2655dc3c26f33c8978f6a3895b186c7e006186cc;hb=4c3668e6527ce3a5456a9cf386491369cda1be7a;hp=faf7e7447764cdc72b0fceb1b60e056f24ce0a20;hpb=5c3d5dc4daca10445253dca635c28fb33f8f263a;p=linux-2.6.git

diff --git a/kernel-2.6.spec b/kernel-2.6.spec
index faf7e7447..2655dc3c2 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 38
+%define taglevel 40
 
 #
 # Polite request for people who spin their own kernel rpms:
@@ -189,6 +189,7 @@ 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
 
 # See also the file named 'sources' here for the related checksums
@@ -408,6 +409,7 @@ KERNEL_PREVIOUS=vanilla
 %endif
 %ApplyPatch 680
 %ApplyPatch 690
+%ApplyPatch 700
 %ApplyPatch 710
 
 
@@ -883,6 +885,12 @@ rm -f /lib/modules/%{KVERREL}uml/modules.*
 %endif
 
 %changelog
+* 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
+
 * Fri May 15 2009 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - linux-2.6-22-38
 - the pcmcia patch needed to be adapted to 2.6.22