[kernel/f15-2.6.39] 2.6.39.2

[Dave Jones]

commit e99605611a38001bc5458a0b2c15e92b8e3178a8
Author: Dave Jones <davej at redhat.com>
Date:   Tue Jul 12 20:17:56 2011 -0400

    2.6.39.2

 ...disable-fast-channel-switching-by-default.patch |   72 -----------------
 ...ix-locking-around-ioc-ioc-data-assignment.patch |   44 -----------
 ...am-workaround-for-bsd-ring-on-sandybridge.patch |   43 ----------
 drm-i915-snb-irq-stalls-fix.patch                  |   53 -------------
 kernel.spec                                        |   30 +++-----
 ...er-dereference-in-scan-get-next-rmap-item.patch |   82 --------------------
 linux-2.6-silence-noise.patch                      |   10 +--
 sources                                            |    1 +
 8 files changed, 16 insertions(+), 319 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index 397f648..b75966e 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -63,7 +63,7 @@ Summary: The Linux kernel
 %if 0%{?released_kernel}
 
 # Do we have a -stable update to apply?
-%define stable_update 2
+%define stable_update 3
 # Is it a -stable RC?
 %define stable_rc 0
 # Set rpm version accordingly
@@ -614,9 +614,6 @@ Patch30: linux-2.6-tracehook.patch
 Patch31: linux-2.6-utrace.patch
 Patch32: linux-2.6-utrace-ptrace.patch
 
-# CVE-2011-2183
-Patch80: ksm-fix-null-pointer-dereference-in-scan-get-next-rmap-item.patch
-
 Patch150: linux-2.6.29-sparc-IOC_TYPECHECK.patch
 
 Patch160: linux-2.6-32bit-mmap-exec-randomization.patch
@@ -654,7 +651,6 @@ Patch570: linux-2.6-selinux-mprotect-checks.patch
 Patch580: linux-2.6-sparc-selinux-mprotect-checks.patch
 
 # scsi / block
-Patch603: cfq-iosched-fix-locking-around-ioc-ioc-data-assignment.patch
 
 # libata
 Patch621: libata-sas-only-set-frozen-flag-if-new-eh-is-supported.patch
@@ -681,8 +677,6 @@ Patch1824: drm-intel-next.patch
 # make sure the lvds comes back on lid open
 Patch1825: drm-intel-make-lvds-work.patch
 Patch1826: drm-intel-edp-fixes.patch
-Patch1830: drm-i915-snb-irq-stalls-fix.patch
-Patch1831: drm-i915-apply-hwstam-workaround-for-bsd-ring-on-sandybridge.patch
 # radeon - new hw + fixes for fusion and t500 regression
 Patch1839: drm-radeon-fix-regression-on-atom-cards-with-hardcoded-EDID-record.patch
 
@@ -727,8 +721,6 @@ Patch12404: x86-pci-preserve-existing-pci-bfsort-whitelist-for-dell-systems.patc
 Patch12416: bluetooth-device-ids-for-ath3k-on-pegatron-lucid-tablets.patch
 
 
-Patch12418: ath5k-disable-fast-channel-switching-by-default.patch
-
 Patch12420: crypto-aesni_intel-merge-with-fpu_ko.patch
 
 %endif
@@ -1173,8 +1165,6 @@ ApplyPatch linux-2.6-utrace.patch
 ApplyPatch linux-2.6-utrace-ptrace.patch
 
 # mm patches
-# CVE-2011-2183
-ApplyPatch ksm-fix-null-pointer-dereference-in-scan-get-next-rmap-item.patch
 
 # Architecture patches
 # x86(-64)
@@ -1240,8 +1230,6 @@ ApplyPatch x86-pci-preserve-existing-pci-bfsort-whitelist-for-dell-systems.patch
 #
 # SCSI / block Bits.
 #
-# rhbz#577968
-ApplyPatch cfq-iosched-fix-locking-around-ioc-ioc-data-assignment.patch
 
 # libata
 # Fix drive detection failure on mvsas (rhbz#705019)
@@ -1305,8 +1293,6 @@ ApplyPatch drm-intel-big-hammer.patch
 ApplyPatch drm-intel-make-lvds-work.patch
 ApplyPatch linux-2.6-intel-iommu-igfx.patch
 ApplyPatch drm-intel-edp-fixes.patch
-ApplyPatch drm-i915-snb-irq-stalls-fix.patch
-ApplyPatch drm-i915-apply-hwstam-workaround-for-bsd-ring-on-sandybridge.patch
 
 # radeon DRM (add cayman support)
 ApplyPatch drm-radeon-fix-regression-on-atom-cards-with-hardcoded-EDID-record.patch -R
@@ -1344,9 +1330,6 @@ ApplyPatch scsi-sd-downgrade-caching-printk-from-error-to-notice.patch
 
 ApplyPatch bluetooth-device-ids-for-ath3k-on-pegatron-lucid-tablets.patch
 
-# rhbz#709122
-ApplyPatch ath5k-disable-fast-channel-switching-by-default.patch
-
 # rhbz#589390
 ApplyPatch crypto-aesni_intel-merge-with-fpu_ko.patch
 
@@ -1958,8 +1941,17 @@ fi
 # and build.
 
 %changelog
+* Tue Jul 12 2011 Dave Jones <davej at redhat.com>
+- 2.6.39.3
+  dropped: (merged upstream)
+   ath5k-disable-fast-channel-switching-by-default.patch
+   cfq-iosched-fix-locking-around-ioc-ioc-data-assignment.patch
+   drm-i915-apply-hwstam-workaround-for-bsd-ring-on-sandybridge.patch
+   drm-i915-snb-irq-stalls-fix.patch
+   ksm-fix-null-pointer-dereference-in-scan-get-next-rmap-item.patch
+
 * Wed Jun 29 2011 Dave Jones <davej at redhat.com>
-- 2.6.39
+- 2.6.39.2
 
 * Mon Jun 27 2011 Dave Jones <davej at redhat.com>
 - Disable CONFIG_CRYPTO_MANAGER_DISABLE_TESTS, as this also disables FIPS (rhbz 716942)
diff --git a/linux-2.6-silence-noise.patch b/linux-2.6-silence-noise.patch
index 32c678b..11d941e 100644
--- a/linux-2.6-silence-noise.patch
+++ b/linux-2.6-silence-noise.patch
@@ -57,16 +57,14 @@ in ye olde CVS tree. I have no idea why. Originally the pr_debug in
 device_pm_remove was nuked as well, but that seems to have gotten lost in
 the r1.634 of kernel.spec (2.6.26-rc2-git5.)
 
-diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c
-index 2a52270..bacbdd2 100644
---- a/drivers/base/power/main.c
-+++ b/drivers/base/power/main.c
-@@ -87,8 +87,6 @@ void device_pm_unlock(void)
+--- linux-2.6.39.x86_64/drivers/base/power/main.c~	2011-07-12 19:58:19.788854464 -0400
++++ linux-2.6.39.x86_64/drivers/base/power/main.c	2011-07-12 19:58:39.684798674 -0400
+@@ -89,8 +89,6 @@ void device_pm_unlock(void)
   */
  void device_pm_add(struct device *dev)
  {
 -	pr_debug("PM: Adding info for %s:%s\n",
 -		 dev->bus ? dev->bus->name : "No Bus", dev_name(dev));
  	mutex_lock(&dpm_list_mtx);
- 	if (dev->parent && dev->parent->power.in_suspend)
+ 	if (dev->parent && dev->parent->power.is_prepared)
  		dev_warn(dev, "parent %s should not be sleeping\n",
diff --git a/sources b/sources
index e7c8483..01f4db7 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,3 @@
 1aab7a741abe08d42e8eccf20de61e05  linux-2.6.39.tar.bz2
+06b858e8f81600038129afe7bcd4e162  patch-2.6.39.3.bz2
 6f81e64e790eb7847773eec4f7cbf207  patch-2.6.39.2.bz2