X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=kernel-2.6.spec;h=8b8b7612ac5207fb37d5c6d87319ece13f47e1fb;hb=0704a877f225262701c4076d16e933d8f92f854c;hp=fd3a70f4ff93be0cc9b9e2709ac71d60e436ac5a;hpb=16060820397c95b0d8034a031494036dc4e177ee;p=linux-2.6.git

diff --git a/kernel-2.6.spec b/kernel-2.6.spec
index fd3a70f4f..8b8b7612a 100644
--- a/kernel-2.6.spec
+++ b/kernel-2.6.spec
@@ -10,7 +10,7 @@ URL: %{SCMURL}
 
 %define name linux-2.6
 %define module_version_varname sublevel
-%define taglevel 16
+%define taglevel 17
 
 %define sublevel 32
 
@@ -668,6 +668,7 @@ Source82: config-s390x-debug
 Source83: config-s390x-debug-rhel
 
 Patch1: patch-2.6.32-71.24.1.el6-vs2.3.0.36.29.6.diff
+Patch2: linux-2.6-255-vserver-delta-cow-fix23.diff
 Patch3: linux-2.6-250-ipsets.patch
 Patch4: linux-2.6-510-ipod.patch
 Patch5: linux-2.6-521-packet-tagging.patch
@@ -964,6 +965,7 @@ make -f %{SOURCE20} VERSION=%{version} configs
 #### Planet-Lab ####
 ApplyPatch patch-2.6.32-71.24.1.el6-vs2.3.0.36.29.6.diff
 ApplyPatch linux-2.6-250-ipsets.patch
+ApplyPatch linux-2.6-255-vserver-delta-cow-fix23.diff
 ApplyPatch linux-2.6-510-ipod.patch
 ApplyPatch linux-2.6-521-packet-tagging.patch
 ApplyPatch linux-2.6-522-iptables-connection-tagging.patch
@@ -1784,6 +1786,9 @@ fi
 %endif
 
 %changelog
+* Tue May 31 2011 Sapan Bhatia <sapanb@cs.princeton.edu> - linux-2.6-32-17
+- This commit fixes the COW issue through a patch provided by Daniel Hozac.
+
 * Sat Apr 09 2011 S.Çağlar Onur <caglar@verivue.com> - linux-2.6-32-16
 - bump to 2.6.32-71.24.1.el6, see https://rhn.redhat.com/errata/RHSA-2011-0421.html