summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@redhat.com>2011-09-07 16:12:01 -0400
committerJosh Boyer <jwboyer@redhat.com>2011-09-07 16:12:01 -0400
commit1bc752781f87f13a8747eb4caee00066499e4aa1 (patch)
tree7ddf4292fdcbf4416a9d9ff4ceb32fd6e538ad2f
parent4cf702284695eff34c6063ea8dfb19a0c83d11ad (diff)
downloadkernel-1bc752781f87f13a8747eb4caee00066499e4aa1.tar.gz
kernel-1bc752781f87f13a8747eb4caee00066499e4aa1.tar.xz
kernel-1bc752781f87f13a8747eb4caee00066499e4aa1.zip
Linux 3.1-rc5
At the moment, kernel.org has been down for several days. Linus pushed his repository to a github repo and did the -rc5 release there. I've generated the patch-3.1-rc5.bz2 from a git tree containing those changes and the -rc5 tag via: git diff v3.0..v3.1-rc5 > patch-3.1-rc5 Hopefully kernel.org will come back before -rc6.
-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 c94a6324f..c57c89066 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 4
+%define rcrev 5
# The git snapshot level
%define gitrev 0
# Set rpm version accordingly
@@ -2040,6 +2040,7 @@ fi
# || ||
%changelog
* Wed Sep 07 2011 Josh Boyer <jwboyer@redhat.com>
+- Linux 3.1-rc5 (locally generated patch from git as kernel.org is down)
- Add patch to fix oops when linking entities in ucvideo (rhbz 735437)
* Fri Sep 02 2011 Dave Jones <davej@redhat.com>
diff --git a/sources b/sources
index 5958093ad..fc4847acc 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
398e95866794def22b12dfbc15ce89c0 linux-3.0.tar.bz2
-0b0f625fd2d97699e5dbf71554373e6b patch-3.1-rc4.bz2
+12eca0e62e330950dff895a67b3c3087 patch-3.1-rc5.bz2