X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=kernel.spec;h=87825c58dc38b392d959abb11691f98b7574892c;hb=fb30f7c64e3c867f25ccbb8db194bdb6e054150b;hp=1745d1bcd803442227ab3e69a49992ab5108d129;hpb=7d6b6a4ebfbabee2c2357340aae01c8545e011c8;p=linux-2.6.git diff --git a/kernel.spec b/kernel.spec index 1745d1bcd..87825c58d 100644 --- 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: delta-ptrace-fix01.diff Patch90250: linux-2.6-250-ipsets.patch Patch90510: linux-2.6-510-ipod.patch Patch90521: linux-2.6-521-packet-tagging.patch @@ -1876,7 +1877,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 +3498,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 delta-ptrace-fix01.diff ApplyPatch linux-2.6-250-ipsets.patch ApplyPatch linux-2.6-510-ipod.patch ApplyPatch linux-2.6-521-packet-tagging.patch @@ -3520,7 +3524,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