summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@redhat.com>2011-09-12 18:21:08 -0400
committerJosh Boyer <jwboyer@redhat.com>2011-09-12 18:21:08 -0400
commit0471e51e8bc5d77e3aa8c9c94f74fbb52a48fcab (patch)
tree76d7a0fdd33f5a22225c8a5855b85e81f481f283
parent27b62b6f8575354a5ed22c9bee9fe0f9bba8f07f (diff)
downloadkernel-0471e51e8bc5d77e3aa8c9c94f74fbb52a48fcab.tar.gz
kernel-0471e51e8bc5d77e3aa8c9c94f74fbb52a48fcab.tar.xz
kernel-0471e51e8bc5d77e3aa8c9c94f74fbb52a48fcab.zip
3.1-rc6
This is another hand-rolled patch from a fully updated git tree as of today. The top level upstream commit is b6fd41e29dea9c6753b1843a77e50433e6123bcb
-rw-r--r--kernel.spec5
-rw-r--r--sources2
2 files changed, 4 insertions, 3 deletions
diff --git a/kernel.spec b/kernel.spec
index d5dfaedc9..385e40a92 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 2
+%global baserelease 0
%global fedora_build %{baserelease}
# base_sublevel is the kernel version we're starting with and patching
@@ -82,7 +82,7 @@ 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 5
+%define rcrev 6
# The git snapshot level
%define gitrev 0
# Set rpm version accordingly
@@ -2044,6 +2044,7 @@ fi
# || ||
%changelog
* Mon Sep 12 2011 Josh Boyer <jwboyer@redhat.com>
+- Linux 3.1-rc6
- Avoid false quiescent states in rcutree with CONFIG_RCU_FAST_NO_HZ. (rhbz 577968)
* Fri Sep 09 2011 Josh Boyer <jwboyer@redhat.com>
diff --git a/sources b/sources
index fc4847acc..474ac9f50 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
398e95866794def22b12dfbc15ce89c0 linux-3.0.tar.bz2
-12eca0e62e330950dff895a67b3c3087 patch-3.1-rc5.bz2
+e283598a0c4cbc6da64cda68101fdbf1 patch-3.1-rc6.bz2