[kernel/f17] Linux 3.3-rc6

[Dave Jones]

commit 322dbeb8ef2ff814ad598926a88065ea1d97123f
Author: Dave Jones <davej at redhat.com>
Date:   Mon Mar 5 11:36:13 2012 -0500

    Linux 3.3-rc6

 config-arm-generic             |    1 +
 drm-intel-crtc-dpms-fix.patch  |   40 ----------------------------------------
 kernel.spec                    |   17 ++++++-----------
 s390x-enable-keys-compat.patch |   15 ---------------
 sources                        |    4 +---
 5 files changed, 8 insertions(+), 69 deletions(-)
---
diff --git a/config-arm-generic b/config-arm-generic
index 8d4d9a9..6cc0d0d 100644
--- a/config-arm-generic
+++ b/config-arm-generic
@@ -201,6 +201,7 @@ CONFIG_LSM_MMAP_MIN_ADDR=32768
 # CONFIG_MACH_EUKREA_CPUIMX35SD is not set
 CONFIG_ARM_ERRATA_720789=y
 CONFIG_ARM_ERRATA_751472=y
+CONFIG_OMAP4_ERRATA_I688=y
 # CONFIG_FB_MX3 is not set
 # CONFIG_MX3_IPU is not set
 # CONFIG_MX3_IPU_IRQS is not set
diff --git a/kernel.spec b/kernel.spec
index 673b996..a2e3aba 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 2
+%global baserelease 1
 %global fedora_build %{baserelease}
 
 # base_sublevel is the kernel version we're starting with and patching
@@ -85,9 +85,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 3
+%define gitrev 0
 # Set rpm version accordingly
 %define rpmversion 3.%{upstream_sublevel}.0
 %endif
@@ -708,7 +708,6 @@ Patch1800: drm-vgem.patch
 # nouveau + drm fixes
 # intel drm is all merged upstream
 Patch1824: drm-intel-next.patch
-Patch1825: drm-intel-crtc-dpms-fix.patch
 
 Patch1900: linux-2.6-intel-iommu-igfx.patch
 
@@ -769,9 +768,6 @@ Patch21236: scsi-fix-sd_revalidate_disk-oops.patch
 Patch21250: mcelog-rcu-splat.patch
 Patch21270: x86-Avoid-invoking-RCU-when-CPU-is-idle.patch
 
-#rhbz 790367
-Patch21280: s390x-enable-keys-compat.patch
-
 #rhbz 795544
 Patch21290: ums_realtek-do-not-use-stack-memory-for-DMA-in-__do_.patch
 
@@ -1449,7 +1445,6 @@ ApplyPatch drm-vgem.patch
 
 # Intel DRM
 ApplyOptionalPatch drm-intel-next.patch
-ApplyPatch drm-intel-crtc-dpms-fix.patch
 
 ApplyPatch linux-2.6-intel-iommu-igfx.patch
 
@@ -1500,9 +1495,6 @@ ApplyPatch scsi-fix-sd_revalidate_disk-oops.patch
 
 ApplyPatch mcelog-rcu-splat.patch
 
-#rhbz 790367
-ApplyPatch s390x-enable-keys-compat.patch
-
 #rhbz 795544
 ApplyPatch ums_realtek-do-not-use-stack-memory-for-DMA-in-__do_.patch
 
@@ -2401,6 +2393,9 @@ fi
 #    '-'      |  |
 #              '-'
 %changelog
+* Mon Mar 05 2012 Dave Jones <davej at redhat.com>
+- Linux 3.3-rc6
+
 * Mon Mar 05 2012 John W. Linville <linville at redhat.com>
 - Turn-off CONFIG_B43_BCMA_EXTRA to avoid b43/brcmsmac overlap
 
diff --git a/sources b/sources
index 714fc96..b09786d 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,3 @@
 364066fa18767ec0ae5f4e4abcf9dc51  linux-3.2.tar.xz
-19b5b3b5529c1d70463cf1db5177047d  patch-3.3-rc5.xz
 02c210a8fd24acca8c1ac93f6f1d3913  compat-wireless-2012-02-05.tar.bz2
-915adf42637fc2fa08f11565fadef1fc  patch-3.3-rc5-git2.xz
-85ab3feb862960898ef69e3b0b939564  patch-3.3-rc5-git3.xz
+cb0886dd96efbacc0c4923d36003b340  patch-3.3-rc6.xz