summaryrefslogtreecommitdiffstats
path: root/kernel.spec
diff options
context:
space:
mode:
authorDave Jones <davej@redhat.com>2011-08-26 12:46:33 -0400
committerDave Jones <davej@redhat.com>2011-08-26 12:46:33 -0400
commit3f1a765f53db7807203afc56bfc3fdc45c429c4f (patch)
tree1b00e337dffd7114777aaff9a71a4f0c89b4ec72 /kernel.spec
parentce55283388749e497f990c13b5777327ef18da18 (diff)
downloadkernel-3f1a765f53db7807203afc56bfc3fdc45c429c4f.tar.gz
kernel-3f1a765f53db7807203afc56bfc3fdc45c429c4f.tar.xz
kernel-3f1a765f53db7807203afc56bfc3fdc45c429c4f.zip
Drop linux-2.6-32bit-mmap-exec-randomization.patch
Outlived it's usefulness (and made of ugly)
Diffstat (limited to 'kernel.spec')
-rw-r--r--kernel.spec10
1 files changed, 5 insertions, 5 deletions
diff --git a/kernel.spec b/kernel.spec
index 1d4cc9907..bd1352971 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -645,7 +645,6 @@ Patch09: linux-2.6-upstream-reverts.patch
# Standalone patches
-Patch160: linux-2.6-32bit-mmap-exec-randomization.patch
Patch161: linux-2.6-i386-nx-emulation.patch
Patch202: linux-2.6-debug-taint-vm.patch
@@ -1211,11 +1210,8 @@ ApplyOptionalPatch linux-2.6-upstream-reverts.patch -R
ApplyPatch arm-omap-dt-compat.patch
ApplyPatch arm-smsc-support-reading-mac-address-from-device-tree.patch
-#
-# Exec shield
-#
+# NX Emulation
ApplyPatch linux-2.6-i386-nx-emulation.patch
-ApplyPatch linux-2.6-32bit-mmap-exec-randomization.patch
#
# bugfixes to drivers and filesystems
@@ -2046,6 +2042,10 @@ fi
# || ||
%changelog
* Fri Aug 26 2011 Dave Jones <davej@redhat.com>
+- Drop linux-2.6-32bit-mmap-exec-randomization.patch
+ Outlived it's usefulness (and made of ugly)
+
+* Fri Aug 26 2011 Dave Jones <davej@redhat.com>
- Drop acpi-ec-add-delay-before-write.patch (rhbz 733690)
* Fri Aug 26 2011 Josh Boyer <jwboyer@redhat.com>