diff --git a/kernel.spec b/kernel.spec index 6bf22ede7..ea76afe61 100644 --- a/kernel.spec +++ b/kernel.spec @@ -51,7 +51,7 @@ Summary: The Linux kernel # For non-released -rc kernels, this will be prepended with "0.", so # for example a 3 here will become 0.3 # -%global baserelease 5 +%global baserelease 6 %global fedora_build %{baserelease} # base_sublevel is the kernel version we're starting with and patching @@ -1105,7 +1105,7 @@ ApplyOptionalPatch linux-2.6-upstream-reverts.patch -R ApplyPatch linux-2.6-hotfixes.patch # Roland's utrace ptrace replacement. -ApplyPatch git-utrace.patch +#ApplyPatch git-utrace.patch # Architecture patches # x86(-64) @@ -1861,6 +1861,9 @@ fi # || || %changelog +* Sat Aug 21 2010 Chuck Ebbert - 2.6.36-0.6.rc1.git3 +- Drop utrace patch that causes hang on boot. + * Fri Aug 20 2010 Chuck Ebbert - 2.6.36-0.5.rc1.git3 - Linux 2.6.36-rc1-git3 - Drop x86-cpu-fix-regression-in-amd-errata-checking-code.patch, now merged.