summaryrefslogtreecommitdiffstats
path: root/kernel.spec
diff options
context:
space:
mode:
authorKyle McMartin <kyle@mcmartin.ca>2010-11-08 10:38:33 -0500
committerKyle McMartin <kyle@mcmartin.ca>2010-11-08 10:38:33 -0500
commit1aea2328b45aa547a36a8db2b75032727c1672a7 (patch)
treeec6ec0a992fe8d9b6e126689c4fe5315e629d342 /kernel.spec
parent7b2f649ec2da6640878c15298f5d3f8451dd8125 (diff)
downloadkernel-1aea2328b45aa547a36a8db2b75032727c1672a7.tar.gz
kernel-1aea2328b45aa547a36a8db2b75032727c1672a7.tar.xz
kernel-1aea2328b45aa547a36a8db2b75032727c1672a7.zip
Cherry-pick utrace-ptrace fixes from mayoung. Thanks!
Diffstat (limited to 'kernel.spec')
-rw-r--r--kernel.spec5
1 files changed, 4 insertions, 1 deletions
diff --git a/kernel.spec b/kernel.spec
index f8c30f610..772f21ad1 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -1122,7 +1122,7 @@ ApplyPatch linux-2.6-hotfixes.patch
# Roland's utrace ptrace replacement.
ApplyPatch linux-2.6-tracehook.patch
ApplyPatch linux-2.6-utrace.patch
-#ApplyPatch linux-2.6-utrace-ptrace.patch
+ApplyPatch linux-2.6-utrace-ptrace.patch
# Architecture patches
# x86(-64)
@@ -1900,6 +1900,9 @@ fi
# || ||
%changelog
+* Mon Nov 08 2010 Kyle McMartin <kyle@redhat.com>
+- Cherry-pick utrace-ptrace fixes from mayoung. Thanks!
+
* Tue Nov 02 2010 Kyle McMartin <kyle@redhat.com> 2.6.37-0.1.rc1.git0
- Linux 2.6.37-rc1