summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKyle McMartin <kyle@dreadnought.i.jkkm.org>2010-09-28 21:38:41 -0400
committerKyle McMartin <kyle@dreadnought.i.jkkm.org>2010-09-28 21:38:41 -0400
commit3aa5eb118f8fed154b7f282638fd3a98f6687166 (patch)
treeec9b911ca872bb0387cea1278b10cee1a5fa17f6
parent4539bcb0e29f9eb8810b1b9edd7904f758e1a184 (diff)
downloadkernel-3aa5eb118f8fed154b7f282638fd3a98f6687166.tar.gz
kernel-3aa5eb118f8fed154b7f282638fd3a98f6687166.tar.xz
kernel-3aa5eb118f8fed154b7f282638fd3a98f6687166.zip
2.6.36-rc6
-rw-r--r--.gitignore1
-rw-r--r--kernel.spec9
-rw-r--r--sources3
3 files changed, 8 insertions, 5 deletions
diff --git a/.gitignore b/.gitignore
index c2fd41347..e05d771aa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ patch-*.bz2
clog
*.rpm
kernel-2.6.*/
+/patch-2.6.36-rc6.bz2
diff --git a/kernel.spec b/kernel.spec
index a4d1ca2dd..a8a807407 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 27
+%global baserelease 28
%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 5
+%define rcrev 6
# The git snapshot level
-%define gitrev 6
+%define gitrev 0
# Set rpm version accordingly
%define rpmversion 2.6.%{upstream_sublevel}
%endif
@@ -1930,6 +1930,9 @@ fi
# || ||
%changelog
+* Tue Sep 28 2010 Kyle McMartin <kyle@redhat.com> 2.6.36-0.28.rc6
+- Linux 2.6.36-rc6
+
* Fri Sep 24 2010 Chuck Ebbert <cebbert@redhat.com> 2.6.36-0.27.rc5.git6
- Linux 2.6.36-rc5-git6
diff --git a/sources b/sources
index b3a52f78e..8ca91d0b7 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,2 @@
091abeb4684ce03d1d936851618687b6 linux-2.6.35.tar.bz2
-eb356a379ec8093f7f4304520ce28de8 patch-2.6.36-rc5.bz2
-2d26ace850787834c6a42da301c3ec87 patch-2.6.36-rc5-git6.bz2
+df4f4d64d812b6eea0079acb62e8ca83 patch-2.6.36-rc6.bz2