summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChuck Ebbert <cebbert@redhat.com>2010-09-13 15:01:41 -0400
committerChuck Ebbert <cebbert@redhat.com>2010-09-13 15:01:41 -0400
commitdb42d7353c3452dc3f7b98d25778e7a7754c9685 (patch)
treea973619c25fb0fe0f0e5e4e886921cac83a0975b
parent2c454f2cf7b5d0e44ef175c73c270a7f943fdad4 (diff)
downloadkernel-db42d7353c3452dc3f7b98d25778e7a7754c9685.tar.gz
kernel-db42d7353c3452dc3f7b98d25778e7a7754c9685.tar.xz
kernel-db42d7353c3452dc3f7b98d25778e7a7754c9685.zip
Linux 2.6.36-rc4
-rw-r--r--kernel.spec9
-rw-r--r--sources3
2 files changed, 7 insertions, 5 deletions
diff --git a/kernel.spec b/kernel.spec
index db07f4a19..b932c4a9d 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 20
+%global baserelease 21
%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 3
+%define rcrev 4
# The git snapshot level
-%define gitrev 4
+%define gitrev 0
# Set rpm version accordingly
%define rpmversion 2.6.%{upstream_sublevel}
%endif
@@ -1882,6 +1882,9 @@ fi
# || ||
%changelog
+* Sat Sep 11 2010 Chuck Ebbert <cebbert@redhat.com>
+- Linux 2.6.36-rc4
+
* Sat Sep 11 2010 Chuck Ebbert <cebbert@redhat.com> - 2.6.36-0.20.rc3.git4
- Linux 2.6.36-rc3-git4
- Drop revert-drm-i915-enable-rc6-on-ironlake.patch, now merged
diff --git a/sources b/sources
index b7d43333f..f966d2417 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,2 @@
091abeb4684ce03d1d936851618687b6 linux-2.6.35.tar.bz2
-94696d0d72fc9a9e70dd10f40d39c573 patch-2.6.36-rc3.bz2
-6c9b5329e128d5f985a6ce9624e491c5 patch-2.6.36-rc3-git4.bz2
+54d5d05eb33085ab5c4a8e467317c8bc patch-2.6.36-rc4.bz2