Linux v3.17.7

5 files changed, 6 insertions, 42 deletions

diff --git a/Kbuild-Add-an-option-to-enable-GCC-VTA.patch b/Kbuild-Add-an-option-to-enable-GCC-VTA.patch
index eef13c4e..6a33a6fc 100644
--- a/Kbuild-Add-an-option-to-enable-GCC-VTA.patch
+++ b/Kbuild-Add-an-option-to-enable-GCC-VTA.patch
@@ -43,7 +43,7 @@ Signed-off-by: Josh Stone <jistone@redhat.com>
  2 files changed, 21 insertions(+), 1 deletion(-)
 
 diff --git a/Makefile b/Makefile
-index bb43e9e6a79c..8a3aba74fe0b 100644
+index 267f8936ff69..452a6738969b 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -709,7 +709,11 @@ KBUILD_CFLAGS	+= -fomit-frame-pointer
diff --git a/ahci-disable-MSI-on-SAMSUNG-0xa800-SSD.patch b/ahci-disable-MSI-on-SAMSUNG-0xa800-SSD.patch
deleted file mode 100644
index 119c2c6b..00000000
--- a/ahci-disable-MSI-on-SAMSUNG-0xa800-SSD.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From: Tejun Heo <tj@kernel.org>
-Date: Thu, 4 Dec 2014 13:13:28 -0500
-Subject: [PATCH] ahci: disable MSI on SAMSUNG 0xa800 SSD
-
-Just like 0x1600 which got blacklisted by 66a7cbc303f4 ("ahci: disable
-MSI instead of NCQ on Samsung pci-e SSDs on macbooks"), 0xa800 chokes
-on NCQ commands if MSI is enabled.  Disable MSI.
-
-Signed-off-by: Tejun Heo <tj@kernel.org>
-Reported-by: Dominik Mierzejewski <dominik@greysector.net>
-Link: https://bugzilla.kernel.org/show_bug.cgi?id=89171
-Cc: stable@vger.kernel.org
----
- drivers/ata/ahci.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c
-index 597b15e7f6e5..ec5d57c152fa 100644
---- a/drivers/ata/ahci.c
-+++ b/drivers/ata/ahci.c
-@@ -492,6 +492,7 @@ static const struct pci_device_id ahci_pci_tbl[] = {
- 	 * enabled.  https://bugzilla.kernel.org/show_bug.cgi?id=60731
- 	 */
- 	{ PCI_VDEVICE(SAMSUNG, 0x1600), board_ahci_nomsi },
-+	{ PCI_VDEVICE(SAMSUNG, 0xa800), board_ahci_nomsi },
- 
- 	/* Enmotus */
- 	{ PCI_DEVICE(0x1c44, 0x8000), board_ahci },
--- 
-2.1.0
-
diff --git a/drm-i915-hush-check-crtc-state.patch b/drm-i915-hush-check-crtc-state.patch
index 682dcfb4..a2a10e19 100644
--- a/drm-i915-hush-check-crtc-state.patch
+++ b/drm-i915-hush-check-crtc-state.patch
@@ -14,10 +14,10 @@ Upstream-status: http://lists.freedesktop.org/archives/intel-gfx/2013-November/0
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
-index 7bd17b3ee95c..15d8e8d97e46 100644
+index 8663c21093d1..361373cde02c 100644
 --- a/drivers/gpu/drm/i915/intel_display.c
 +++ b/drivers/gpu/drm/i915/intel_display.c
-@@ -10660,7 +10660,7 @@ check_crtc_state(struct drm_device *dev)
+@@ -10658,7 +10658,7 @@ check_crtc_state(struct drm_device *dev)
  
  		if (active &&
  		    !intel_pipe_config_compare(dev, &crtc->config, &pipe_config)) {
diff --git a/kernel.spec b/kernel.spec
index 83618c38..fb42bd40 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -54,7 +54,7 @@ Summary: The Linux kernel
 %if 0%{?released_kernel}
 
 # Do we have a -stable update to apply?
-%define stable_update 6
+%define stable_update 7
 # Set rpm version accordingly
 %if 0%{?stable_update}
 %define stablerev %{stable_update}
@@ -632,9 +632,6 @@ Patch26092: xhci-Add-broken-streams-quirk-for-Fresco-Logic-FL100.patch
 Patch26093: uas-Add-US_FL_NO_ATA_1X-for-Seagate-devices-with-usb.patch
 Patch26094: uas-Add-US_FL_NO_REPORT_OPCODES-for-JMicron-JMS566-w.patch
 
-#rhbz 1084928
-Patch26095: ahci-disable-MSI-on-SAMSUNG-0xa800-SSD.patch
-
 #rhbz 1172543
 Patch26096: cfg80211-don-t-WARN-about-two-consecutive-Country-IE.patch
 
@@ -1389,9 +1386,6 @@ ApplyPatch xhci-Add-broken-streams-quirk-for-Fresco-Logic-FL100.patch
 ApplyPatch uas-Add-US_FL_NO_ATA_1X-for-Seagate-devices-with-usb.patch
 ApplyPatch uas-Add-US_FL_NO_REPORT_OPCODES-for-JMicron-JMS566-w.patch
 
-#rhbz 1084928
-ApplyPatch ahci-disable-MSI-on-SAMSUNG-0xa800-SSD.patch
-
 #rhbz 1172543
 ApplyPatch cfg80211-don-t-WARN-about-two-consecutive-Country-IE.patch
 
@@ -2280,6 +2274,7 @@ fi
 #                                    ||     ||
 %changelog
 * Tue Dec 16 2014 Josh Boyer <jwboyer@fedoraproject.org>
+- Linux v3.17.7
 - CVE-2014-8559 deadlock due to incorrect usage of rename_lock (rhbz 1159313 1173814)
 - Add patch from Josh Stone to restore var-tracking via Kconfig (rhbz 1126580)
 
diff --git a/sources b/sources
index 84792c70..396a8ab2 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
 fb30d0f29214d75cddd2faa94f73d5cf  linux-3.17.tar.xz
 159e969cbc27201d8e2fa0f609dc722f  perf-man-3.17.tar.gz
-a249818fc3c167a067b1508d86855efa  patch-3.17.6.xz
+96d5959bdc223fa6aa0ed132c93cf814  patch-3.17.7.xz