[kernel] Linux 2.6.36-rc7 upstream
Kyle McMartin
kyle at fedoraproject.org
Wed Oct 6 21:52:08 UTC 2010
commit 72c4be84a676bbaab4d705986894ede0096300a3
Author: Kyle McMartin <kyle at ihatethathostname.lab.bos.redhat.com>
Date: Wed Oct 6 17:52:09 2010 -0400
Linux 2.6.36-rc7 upstream
.gitignore | 3 +--
kernel.spec | 11 ++++++-----
linux-2.6-rcu-netpoll.patch | 16 ----------------
sources | 3 +--
4 files changed, 8 insertions(+), 25 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 3efaf8f..1e1b13b 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 f0c3231..515ec56 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 at redhat.com> 2.6.36-0.35.rc7.git0
+- Linux 2.6.36-rc7 upstream.
+
* Wed Oct 06 2010 Dave Jones <davej at redhat.com>
- Another day, another rcu_dereference warning. (#640673)
diff --git a/sources b/sources
index 48cbdd9..e79f508 100644
--- a/sources
+++ b/sources
@@ -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
More information about the scm-commits
mailing list