X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=kernel-2.6.spec;h=e89ad6553df5e91a99a190daacaf0b6d73c518f4;hb=79cf5808baf74c15ea839411d08ecefb5ad75780;hp=8979c77ea70d701571c1dc91055032bffc35ddf9;hpb=33374713a812fdaa972c1076af956eba9822f4f3;p=linux-2.6.git

diff --git a/kernel-2.6.spec b/kernel-2.6.spec
index 8979c77ea..e89ad6553 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 13
+%define taglevel 14
 
 %define sublevel 32
 
@@ -665,8 +665,7 @@ Source79: config-debug-rhel
 Source80: config-generic-rhel
 Source81: config-powerpc64
 
-Patch1: patch-2.6.32-71.18.2.el6-vs2.3.0.36.29.4.diff
-Patch2: linux-2.6-220-delta-ptrace-fix01.patch
+Patch1: patch-2.6.32-71.18.2.el6-vs2.3.0.36.29.6.diff
 Patch3: linux-2.6-250-ipsets.patch
 Patch4: linux-2.6-510-ipod.patch
 Patch5: linux-2.6-521-packet-tagging.patch
@@ -961,8 +960,7 @@ cp %{SOURCE15} %{SOURCE1} %{SOURCE16} %{SOURCE17} %{SOURCE18} .
 make -f %{SOURCE20} VERSION=%{version} configs
 
 #### Planet-Lab ####
-ApplyPatch patch-2.6.32-71.18.2.el6-vs2.3.0.36.29.4.diff
-ApplyPatch linux-2.6-220-delta-ptrace-fix01.patch
+ApplyPatch patch-2.6.32-71.18.2.el6-vs2.3.0.36.29.6.diff
 ApplyPatch linux-2.6-250-ipsets.patch
 ApplyPatch linux-2.6-510-ipod.patch
 ApplyPatch linux-2.6-521-packet-tagging.patch
@@ -1784,6 +1782,9 @@ fi
 %endif
 
 %changelog
+* Wed Mar 16 2011 S.Çağlar Onur <caglar@verivue.com> - linux-2.6-32-14
+- Do not enable CONFIG_SYSFS_DEPRECATED* options for Scientific Linux
+
 * Thu Mar 10 2011 S.Çağlar Onur <caglar@verivue.com> - linux-2.6-32-13
 - bump to 2.6.32-71.18.2.el6, see https://rhn.redhat.com/errata/RHSA-2011-0329.html