summaryrefslogtreecommitdiffstats
path: root/kernel.spec
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@redhat.com>2012-02-21 10:51:15 -0500
committerJosh Boyer <jwboyer@redhat.com>2012-02-21 10:52:32 -0500
commit12b12c6ad67192aa4d9b64d7a4e7d147287fadaa (patch)
tree59b73871b8f9868521c6834888f3619471059ccf /kernel.spec
parent71c117f4fa43f9cebfd450ef8f4c8736e61b2c92 (diff)
downloadkernel-12b12c6ad67192aa4d9b64d7a4e7d147287fadaa.tar.gz
kernel-12b12c6ad67192aa4d9b64d7a4e7d147287fadaa.tar.xz
kernel-12b12c6ad67192aa4d9b64d7a4e7d147287fadaa.zip
Linux 3.3-rc4-git1 (upstream 27e74da9800289e69ba907777df1e2085231eff7)
Diffstat (limited to 'kernel.spec')
-rw-r--r--kernel.spec13
1 files changed, 5 insertions, 8 deletions
diff --git a/kernel.spec b/kernel.spec
index e9435c9d9..8b4560a82 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -54,7 +54,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 3
+%global baserelease 1
%global fedora_build %{baserelease}
# base_sublevel is the kernel version we're starting with and patching
@@ -87,7 +87,7 @@ Summary: The Linux kernel
# The rc snapshot level
%define rcrev 4
# The git snapshot level
-%define gitrev 0
+%define gitrev 1
# Set rpm version accordingly
%define rpmversion 3.%{upstream_sublevel}.0
%endif
@@ -764,9 +764,6 @@ Patch21234: Bluetooth-Remove-bogus-inline-decl-from-l2cap_chan_connect.patch
Patch21235: scsi-sd_revalidate_disk-prevent-NULL-ptr-deref.patch
Patch21236: scsi-fix-sd_revalidate_disk-oops.patch
-#rhbz 714828
-Patch21240: autofs4-lockdep.patch
-
Patch21250: mcelog-rcu-splat.patch
Patch21260: x86-Avoid-invoking-RCU-when-CPU-is-idle.patch
@@ -1488,9 +1485,6 @@ ApplyPatch Bluetooth-Remove-bogus-inline-decl-from-l2cap_chan_connect.patch
ApplyPatch scsi-sd_revalidate_disk-prevent-NULL-ptr-deref.patch
ApplyPatch scsi-fix-sd_revalidate_disk-oops.patch
-#rhbz 714828
-ApplyPatch autofs4-lockdep.patch
-
ApplyPatch mcelog-rcu-splat.patch
ApplyPatch x86-Avoid-invoking-RCU-when-CPU-is-idle.patch
@@ -2371,6 +2365,9 @@ fi
# ||----w |
# || ||
%changelog
+* Tue Feb 21 2012 Josh Boyer <jwboyer@redhat.com> - 3.3.0-0.rc4.git1.1
+- Linux 3.3-rc4-git1 (upstream 27e74da9800289e69ba907777df1e2085231eff7)
+
* Mon Feb 20 2012 Dave Jones <davej@redhat.com>
- Do not call drivers when invalidating partitions for -ENOMEDIUM