summaryrefslogtreecommitdiffstats
path: root/kernel.spec
diff options
context:
space:
mode:
Diffstat (limited to 'kernel.spec')
-rw-r--r--kernel.spec12
1 files changed, 11 insertions, 1 deletions
diff --git a/kernel.spec b/kernel.spec
index c383e0c66..3641eb53d 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -54,7 +54,7 @@ Summary: The Linux kernel
# For non-released -rc kernels, this will be appended after the rcX and
# gitX tags, so a 3 here would become part of release "0.rcX.gitX.3"
#
-%global baserelease 1
+%global baserelease 2
%global fedora_build %{baserelease}
# base_sublevel is the kernel version we're starting with and patching
@@ -758,6 +758,9 @@ Patch21235: scsi-sd_revalidate_disk-prevent-NULL-ptr-deref.patch
#rhbz 714828
Patch21236: autofs4-lockdep.patch
+Patch21237: mcelog-rcu-splat.patch
+Patch21238: x86-Avoid-invoking-RCU-when-CPU-is-idle.patch
+
# compat-wireless patches
Patch50000: compat-wireless-config-fixups.patch
Patch50001: compat-wireless-pr_fmt-warning-avoidance.patch
@@ -1464,6 +1467,9 @@ ApplyPatch scsi-sd_revalidate_disk-prevent-NULL-ptr-deref.patch
#rhbz 714828
ApplyPatch autofs4-lockdep.patch
+ApplyPatch mcelog-rcu-splat.patch
+ApplyPatch x86-Avoid-invoking-RCU-when-CPU-is-idle.patch
+
# END OF PATCH APPLICATIONS
%endif
@@ -2334,6 +2340,10 @@ fi
# ||----w |
# || ||
%changelog
+* Tue Feb 14 2012 Josh Boyer <jwboyer@redhat.com>
+- Add patch to fix RCU usage during cpu idle (rhbz 789641)
+- Add patch to fix mce rcu splat (rhbz 789644)
+
* Tue Feb 14 2012 Josh Boyer <jwboyer@redhat.com> - 3.3.0-0.rc3.git5.1
- Linux 3.3-rc3-git5 (upstream ce5afed937f0a823d3b00c9459409c3f5f2fbd5d)