diff options
| -rw-r--r-- | .gitignore | 3 | ||||
| -rw-r--r-- | kernel.spec | 11 | ||||
| -rw-r--r-- | linux-2.6-rcu-netpoll.patch | 16 | ||||
| -rw-r--r-- | sources | 3 |
4 files changed, 8 insertions, 25 deletions
diff --git a/.gitignore b/.gitignore index 3efaf8fce..1e1b13b0f 100644 --- a/.gitignore +++ b/.gitignore @@ -3,5 +3,4 @@ patch-*.bz2 clog *.rpm kernel-2.6.*/ -/patch-2.6.36-rc6.bz2 -/patch-2.6.36-rc6-git3.bz2 +/patch-2.6.36-rc7.bz2 diff --git a/kernel.spec b/kernel.spec index f0c3231ce..515ec5673 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 34 +%global baserelease 35 %global fedora_build %{baserelease} # base_sublevel is the kernel version we're starting with and patching @@ -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 6 +%define rcrev 7 # The git snapshot level -%define gitrev 3 +%define gitrev 0 # Set rpm version accordingly %define rpmversion 2.6.%{upstream_sublevel} %endif @@ -682,7 +682,6 @@ Patch2912: linux-2.6-v4l-dvb-ir-core-update.patch Patch2917: hdpvr-ir-enable.patch Patch3000: linux-2.6-rcu-sched-warning.patch -Patch3010: linux-2.6-rcu-netpoll.patch # fs fixes @@ -1296,7 +1295,6 @@ ApplyPatch hdpvr-ir-enable.patch # silence another rcu_reference warning ApplyPatch linux-2.6-rcu-sched-warning.patch -ApplyPatch linux-2.6-rcu-netpoll.patch # Patches headed upstream ApplyPatch disable-i8042-check-on-apple-mac.patch @@ -1942,6 +1940,9 @@ fi # || || %changelog +* Wed Oct 06 2010 Kyle McMartin <kyle@redhat.com> 2.6.36-0.35.rc7.git0 +- Linux 2.6.36-rc7 upstream. + * Wed Oct 06 2010 Dave Jones <davej@redhat.com> - Another day, another rcu_dereference warning. (#640673) diff --git a/linux-2.6-rcu-netpoll.patch b/linux-2.6-rcu-netpoll.patch deleted file mode 100644 index 540b39341..000000000 --- a/linux-2.6-rcu-netpoll.patch +++ /dev/null @@ -1,16 +0,0 @@ - -diff --git a/include/linux/rcupdate.h b/include/linux/rcupdate.h -index 9fbc54a..435c502 100644 ---- a/include/linux/rcupdate.h -+++ b/include/linux/rcupdate.h -@@ -454,7 +454,7 @@ static inline notrace void rcu_read_unlock_sched_notrace(void) - * Makes rcu_dereference_check() do the dirty work. - */ - #define rcu_dereference_bh(p) \ -- rcu_dereference_check(p, rcu_read_lock_bh_held()) -+ rcu_dereference_check(p, rcu_read_lock_bh_held() || irqs_disabled()) - - /** - * rcu_dereference_sched - fetch RCU-protected pointer, checking for RCU-sched - - @@ -1,3 +1,2 @@ 091abeb4684ce03d1d936851618687b6 linux-2.6.35.tar.bz2 -df4f4d64d812b6eea0079acb62e8ca83 patch-2.6.36-rc6.bz2 -c99be287793f1b0b3eb7771443937359 patch-2.6.36-rc6-git3.bz2 +d8e63ac9d7e25fb71a04ded58240ac96 patch-2.6.36-rc7.bz2 |