[kernel] Linux v3.3-rc7-103-g0c4d067

Dave Jones davej at fedoraproject.org
Fri Mar 16 20:00:25 UTC 2012


commit d0ee9bb8b338225266cf2e514bef5d20029deb4c
Author: Dave Jones <davej at redhat.com>
Date:   Fri Mar 16 16:00:08 2012 -0400

    Linux v3.3-rc7-103-g0c4d067

 config-x86-generic                     |    3 +
 kernel.spec                            |    9 +-
 scsi-fix-sd_revalidate_disk-oops.patch |  187 --------------------------------
 sources                                |    1 +
 4 files changed, 9 insertions(+), 191 deletions(-)
---
diff --git a/config-x86-generic b/config-x86-generic
index d000917..4243d22 100644
--- a/config-x86-generic
+++ b/config-x86-generic
@@ -187,10 +187,12 @@ CONFIG_HW_RANDOM_VIA=m
 
 CONFIG_X86_PLATFORM_DEVICES=y
 
+CONFIG_AMILO_RFKILL=m
 CONFIG_ASUS_LAPTOP=m
 CONFIG_COMPAL_LAPTOP=m
 CONFIG_DELL_LAPTOP=m
 CONFIG_EEEPC_LAPTOP=m
+CONFIG_FUJITSU_TABLET=m
 CONFIG_FUJITSU_LAPTOP=m
 # CONFIG_FUJITSU_LAPTOP_DEBUG is not set
 CONFIG_IDEAPAD_LAPTOP=m
@@ -200,6 +202,7 @@ CONFIG_SAMSUNG_LAPTOP=m
 CONFIG_SONY_LAPTOP=m
 CONFIG_TOPSTAR_LAPTOP=m
 
+
 CONFIG_ACPI_WMI=m
 CONFIG_ACER_WMI=m
 CONFIG_ACERHDF=m
diff --git a/kernel.spec b/kernel.spec
index f1b5796..9aacc4c 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 at redhat.com> - 3.3.0-0.rc7.git1.1
+- Linux v3.3-rc7-103-g0c4d067
+
 * Fri Mar 16 2012 Justin M. Forbes <jforbes at redhat.com>
 - re-enable threading on hibernate compression/decompression
 
diff --git a/sources b/sources
index c3dd17d..aef728a 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,3 @@
 364066fa18767ec0ae5f4e4abcf9dc51  linux-3.2.tar.xz
 4364d0789141647508a9eb1fba8ffa6f  patch-3.3-rc7.xz
+3f5bb6b92a6d434829ad39c0b4ebe639  patch-3.3-rc7-git2.xz


More information about the scm-commits mailing list