net/packet/built-in.o:(.discard+0x0): multiple definition of __pcpu_unique_sknid_elevator

[linux-2.6.git] / kernel.spec

diff --git a/kernel.spec b/kernel.spec
index 1745d1b..2900f39 100644 (file)
--- a/kernel.spec
+++ b/kernel.spec
@@ -1851,6 +1851,7 @@ Patch1237: mm-Switch-to-SLAB.patch
 Patch1238: redhat-kABI-Update-the-kABI-for-2-6-18-el6.patch
 
 Patch88888: patch-2.6.32-19.el6-vs2.3.0.36.29.4.diff
+Patch90220: linux-2.6-220-delta-ptrace-fix01.patch
 Patch90250: linux-2.6-250-ipsets.patch
 Patch90510: linux-2.6-510-ipod.patch
 Patch90521: linux-2.6-521-packet-tagging.patch
@@ -1864,7 +1865,8 @@ Patch90525: linux-2.6-525-sknid-elevator.patch
 #Patch90527:  linux-2.6-527-iptables-classify-add-mark.patch
 #
 Patch90530: linux-2.6-530-built-by-support.patch
-Patch90540: linux-2.6-540-oom-kill.patch
+# /proc/sys/vm/panic_on_oom ?
+#Patch90540: linux-2.6-540-oom-kill.patch
 Patch90550: linux-2.6-550-raise-default-nfile-ulimit.patch
 Patch90570:  linux-2.6-570-tagxid.patch
 Patch90580:  linux-2.6-580-show-proc-virt.patch
@@ -1876,7 +1878,9 @@ Patch90640:  linux-2.6-640-netlink-audit-hack.patch
 Patch90650:  linux-2.6-650-hangcheck-reboot.patch
 Patch90660:  linux-2.6-660-nmi-watchdog-default.patch
 Patch90680:  linux-2.6-680-htb-hysteresis-tso.patch
-
+#
+#Patch90700: linux-2.6-700-egre.patch
+#
 
 # empty final patch file to facilitate testing of kernel patches
 Patch99999: linux-kernel-test.patch
@@ -3495,6 +3499,7 @@ ApplyPatch mm-Switch-to-SLAB.patch
 ApplyPatch redhat-kABI-Update-the-kABI-for-2-6-18-el6.patch
 
 ApplyPatch patch-2.6.32-19.el6-vs2.3.0.36.29.4.diff
+ApplyPatch linux-2.6-220-delta-ptrace-fix01.patch
 ApplyPatch linux-2.6-250-ipsets.patch
 ApplyPatch linux-2.6-510-ipod.patch
 ApplyPatch linux-2.6-521-packet-tagging.patch
@@ -3508,7 +3513,7 @@ ApplyPatch linux-2.6-525-sknid-elevator.patch
 #ApplyPatch linux-2.6-527-iptables-classify-add-mark.patch
 #
 ApplyPatch linux-2.6-530-built-by-support.patch
-ApplyPatch linux-2.6-540-oom-kill.patch
+#ApplyPatch linux-2.6-540-oom-kill.patch
 ApplyPatch linux-2.6-550-raise-default-nfile-ulimit.patch
 ApplyPatch linux-2.6-570-tagxid.patch
 ApplyPatch linux-2.6-580-show-proc-virt.patch
@@ -3520,7 +3525,9 @@ ApplyPatch linux-2.6-640-netlink-audit-hack.patch
 ApplyPatch linux-2.6-650-hangcheck-reboot.patch
 ApplyPatch linux-2.6-660-nmi-watchdog-default.patch
 ApplyPatch linux-2.6-680-htb-hysteresis-tso.patch
-
+#
+#ApplyPatch linux-2.6-700-egre.patch
+#
 
 ApplyOptionalPatch linux-kernel-test.patch