summaryrefslogtreecommitdiffstats
path: root/kernel.spec
diff options
context:
space:
mode:
authorDave Jones <davej@redhat.com>2012-03-16 16:00:08 -0400
committerDave Jones <davej@redhat.com>2012-03-16 16:00:08 -0400
commitd0ee9bb8b338225266cf2e514bef5d20029deb4c (patch)
treecda61d513cb3ed860e7fba8bf620504eecc4870a /kernel.spec
parent4cffa5f488c95917a86bd033046f56668f9d1846 (diff)
downloadkernel-d0ee9bb8b338225266cf2e514bef5d20029deb4c.tar.gz
kernel-d0ee9bb8b338225266cf2e514bef5d20029deb4c.tar.xz
kernel-d0ee9bb8b338225266cf2e514bef5d20029deb4c.zip
Linux v3.3-rc7-103-g0c4d067
Diffstat (limited to 'kernel.spec')
-rw-r--r--kernel.spec9
1 files changed, 5 insertions, 4 deletions
diff --git a/kernel.spec b/kernel.spec
index f1b57966f..9aacc4c07 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -62,7 +62,7 @@ Summary: The Linux kernel
# For non-released -rc kernels, this will be appended after the rcX and
# gitX tags, so a 3 here would become part of release "0.rcX.gitX.3"
#
-%global baserelease 6
+%global baserelease 1
%global fedora_build %{baserelease}
# base_sublevel is the kernel version we're starting with and patching
@@ -95,7 +95,7 @@ Summary: The Linux kernel
# The rc snapshot level
%define rcrev 7
# The git snapshot level
-%define gitrev 0
+%define gitrev 1
# Set rpm version accordingly
%define rpmversion 3.%{upstream_sublevel}.0
%endif
@@ -758,7 +758,6 @@ Patch21233: jbd2-clear-BH_Delay-and-BH_Unwritten-in-journal_unmap_buf.patch
#rhbz 754518
Patch21235: scsi-sd_revalidate_disk-prevent-NULL-ptr-deref.patch
-Patch21236: scsi-fix-sd_revalidate_disk-oops.patch
Patch21250: mcelog-rcu-splat.patch
Patch21260: x86-Avoid-invoking-RCU-when-CPU-is-idle.patch
@@ -1466,7 +1465,6 @@ ApplyPatch jbd2-clear-BH_Delay-and-BH_Unwritten-in-journal_unmap_buf.patch
#rhbz 754518
ApplyPatch scsi-sd_revalidate_disk-prevent-NULL-ptr-deref.patch
-ApplyPatch scsi-fix-sd_revalidate_disk-oops.patch
ApplyPatch mcelog-rcu-splat.patch
@@ -2344,6 +2342,9 @@ fi
# ||----w |
# || ||
%changelog
+* Fri Mar 16 2012 Dave Jones <davej@redhat.com> - 3.3.0-0.rc7.git1.1
+- Linux v3.3-rc7-103-g0c4d067
+
* Fri Mar 16 2012 Justin M. Forbes <jforbes@redhat.com>
- re-enable threading on hibernate compression/decompression