summaryrefslogtreecommitdiffstats
path: root/kernel.spec
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@redhat.com>2011-08-15 10:06:52 -0400
committerJosh Boyer <jwboyer@redhat.com>2011-08-15 10:06:52 -0400
commit6920e17ebc39b209f18c9fcf8cccf19b3b984560 (patch)
tree0b8caccd4041abb4c068dfe14b6eb9de711e852d /kernel.spec
parentf1b16b1fca682d767ea2cc2f91837fd34a4bf577 (diff)
downloadkernel-6920e17ebc39b209f18c9fcf8cccf19b3b984560.tar.gz
kernel-6920e17ebc39b209f18c9fcf8cccf19b3b984560.tar.xz
kernel-6920e17ebc39b209f18c9fcf8cccf19b3b984560.zip
Linux-3.1-rc2
Add better fix from Paul McKenney for rcu scheduling issue (rhbz 726877)
Diffstat (limited to 'kernel.spec')
-rw-r--r--kernel.spec12
1 files changed, 8 insertions, 4 deletions
diff --git a/kernel.spec b/kernel.spec
index 91839efb9..60dd89a4d 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -82,9 +82,9 @@ Summary: The Linux kernel
# The next upstream release sublevel (base_sublevel+1)
%define upstream_sublevel %(echo $((%{base_sublevel} + 1)))
# The rc snapshot level
-%define rcrev 1
+%define rcrev 2
# The git snapshot level
-%define gitrev 6
+%define gitrev 0
# Set rpm version accordingly
%define rpmversion 3.%{upstream_sublevel}.0
%endif
@@ -684,7 +684,7 @@ Patch12021: udlfb-bind-framebuffer-to-interface.patch
Patch12022: fix-cdc-ncm-dma-stack-vars.patch
Patch12023: ums-realtek-driver-uses-stack-memory-for-DMA.patch
Patch12024: epoll-fix-spurious-lockdep-warnings.patch
-Patch12025: rcu-prevent-early-schedule.patch
+Patch12025: rcu-avoid-just-onlined-cpu-resched.patch
# Runtime power management
Patch12203: linux-2.6-usb-pci-autosuspend.patch
@@ -1261,7 +1261,7 @@ ApplyPatch udlfb-bind-framebuffer-to-interface.patch
ApplyPatch fix-cdc-ncm-dma-stack-vars.patch
ApplyPatch ums-realtek-driver-uses-stack-memory-for-DMA.patch
ApplyPatch epoll-fix-spurious-lockdep-warnings.patch
-ApplyPatch rcu-prevent-early-schedule.patch
+ApplyPatch rcu-avoid-just-onlined-cpu-resched.patch
# Runtime PM
#ApplyPatch linux-2.6-usb-pci-autosuspend.patch
@@ -1898,6 +1898,10 @@ fi
# ||----w |
# || ||
%changelog
+* Mon Aug 15 2011 Josh Boyer <jwboyer@redhat.com>
+- Linux-3.1-rc2
+- Replace trial patch for rhbz 726877 with a better fix
+
* Thu Aug 11 2011 Josh Boyer <jwboyer@redhat.com>
- Linux-3.1-rc1-git6
- Make ide_pmac a module (rhbz 730039)