[kernel] Linux 3.2-rc6

[Josh Boyer]

commit 799841bbdd0d8dc24c267c8cd13159c614ef871b
Author: Josh Boyer <jwboyer at redhat.com>
Date:   Sat Dec 17 08:58:46 2011 -0500

    Linux 3.2-rc6

 drm-i915-sdvo-lvds-is-digital.patch |   83 -----------------------------------
 kernel.spec                         |   10 ++--
 linux-2.6-intel-iommu-igfx.patch    |   18 ++++----
 sources                             |    3 +-
 4 files changed, 15 insertions(+), 99 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index 2c3a74a..6c4b085 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -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 4
+%define gitrev 0
 # Set rpm version accordingly
 %define rpmversion 3.%{upstream_sublevel}.0
 %endif
@@ -681,8 +681,6 @@ Patch1700: drm-edid-try-harder-to-fix-up-broken-headers.patch
 # nouveau + drm fixes
 # intel drm is all merged upstream
 Patch1824: drm-intel-next.patch
-# rhbz#729882, https://bugs.freedesktop.org/attachment.cgi?id=49069
-Patch1826: drm-i915-sdvo-lvds-is-digital.patch
 
 Patch1900: linux-2.6-intel-iommu-igfx.patch
 
@@ -1368,7 +1366,6 @@ ApplyPatch drm-edid-try-harder-to-fix-up-broken-headers.patch
 
 # Intel DRM
 ApplyOptionalPatch drm-intel-next.patch
-ApplyPatch drm-i915-sdvo-lvds-is-digital.patch
 
 ApplyPatch linux-2.6-intel-iommu-igfx.patch
 
@@ -2233,6 +2230,9 @@ fi
 #                 ||----w |
 #                 ||     ||
 %changelog
+* Sat Dec 17 2011 Josh Boyer <jwboyer at redhat.com> - 3.2.0-0.rc6.git0.1
+- Linux 3.2-rc6
+
 * Fri Dec 16 2011 Dave Jones <davej at redhat.com> - 3.2.0-0.rc5.git4.1
 - Linux 3.2-rc5-git4 (6f12d2ee52dcf97dcefdadbd500e7650311eaa6a)
 
diff --git a/linux-2.6-intel-iommu-igfx.patch b/linux-2.6-intel-iommu-igfx.patch
index d54ae3c..3a45aba 100644
--- a/linux-2.6-intel-iommu-igfx.patch
+++ b/linux-2.6-intel-iommu-igfx.patch
@@ -1,4 +1,4 @@
-From e13491e4c394907ffdd834aeccca279213818079 Mon Sep 17 00:00:00 2001
+From 602e1f209dd983e40d989e871cd253e8187899b8 Mon Sep 17 00:00:00 2001
 From: drago01 <drago01 at gmail.com>
 Date: Wed, 26 Oct 2011 13:37:27 -0400
 Subject: [PATCH] Default to igfx_off
@@ -21,10 +21,10 @@ Reviewed-by: Adam Jackson <ajax at redhat.com>
  2 files changed, 10 insertions(+), 10 deletions(-)
 
 diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
-index a8ba119..8ddc43a 100644
+index 81c287f..ee5693b 100644
 --- a/Documentation/kernel-parameters.txt
 +++ b/Documentation/kernel-parameters.txt
-@@ -998,12 +998,11 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
+@@ -1014,12 +1014,11 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
  			Enable intel iommu driver.
  		off
  			Disable intel iommu driver.
@@ -43,12 +43,12 @@ index a8ba119..8ddc43a 100644
  			With this option iommu will not optimize to look
  			for io virtual address below 32-bit forcing dual
 diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c
-index be1953c..2e23af1 100644
+index bdc447f..240db6b 100644
 --- a/drivers/iommu/intel-iommu.c
 +++ b/drivers/iommu/intel-iommu.c
-@@ -404,7 +404,8 @@ int dmar_disabled = 0;
- int dmar_disabled = 1;
- #endif /*CONFIG_INTEL_IOMMU_DEFAULT_ON*/
+@@ -408,7 +408,8 @@ int dmar_disabled = 1;
+ int intel_iommu_enabled = 0;
+ EXPORT_SYMBOL_GPL(intel_iommu_enabled);
  
 -static int dmar_map_gfx = 1;
 +/* disabled by default; causes way too many issues */
@@ -56,7 +56,7 @@ index be1953c..2e23af1 100644
  static int dmar_forcedac;
  static int intel_iommu_strict;
  static int intel_iommu_superpage = 1;
-@@ -429,10 +430,10 @@ static int __init intel_iommu_setup(char *str)
+@@ -433,10 +434,10 @@ static int __init intel_iommu_setup(char *str)
  		} else if (!strncmp(str, "off", 3)) {
  			dmar_disabled = 1;
  			printk(KERN_INFO "Intel-IOMMU: disabled\n");
@@ -71,5 +71,5 @@ index be1953c..2e23af1 100644
  			printk(KERN_INFO
  				"Intel-IOMMU: Forcing DAC for PCI devices\n");
 -- 
-1.7.6.4
+1.7.7.4
 
diff --git a/sources b/sources
index 09f2e6e..0a9bc06 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,3 @@
 8d43453f8159b2332ad410b19d86a931  linux-3.1.tar.bz2
-83560f29ec67cb44535c5d66d6cf9606  patch-3.2-rc5.xz
+020a0ea456f0f061bf8d7c52c3670421  patch-3.2-rc6.xz
 5360f273d6b9e930675bf48f9aad33f7  compat-wireless-2011-12-01.tar.bz2
-e870c2d57d892783c3929ac66ed7250c  patch-3.2-rc5-git4.xz