Linux v3.18.6

3 files changed, 6 insertions, 38 deletions

diff --git a/kernel.spec b/kernel.spec
index 3f4cdaa0..3b8fac5a 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -42,7 +42,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 201
+%global baserelease 200
 %global fedora_build %{baserelease}
 
 # base_sublevel is the kernel version we're starting with and patching
@@ -54,7 +54,7 @@ Summary: The Linux kernel
 %if 0%{?released_kernel}
 
 # Do we have a -stable update to apply?
-%define stable_update 5
+%define stable_update 6
 # Set rpm version accordingly
 %if 0%{?stable_update}
 %define stablerev %{stable_update}
@@ -618,7 +618,6 @@ Patch26121: Set-UID-in-sess_auth_rawntlmssp_authenticate-too.patch
 #rhbz 1124119
 Patch26126: uas-Do-not-blacklist-ASM1153-disk-enclosures.patch
 Patch26127: uas-Add-US_FL_NO_ATA_1X-for-2-more-Seagate-disk-encl.patch
-Patch26128: uas-Add-no-report-opcodes-quirk-for-Simpletech-devic.patch
 
 #rhbz 1115713
 Patch26129: samsung-laptop-Add-use_native_backlight-quirk-and-en.patch
@@ -1365,7 +1364,6 @@ ApplyPatch Set-UID-in-sess_auth_rawntlmssp_authenticate-too.patch
 #rhbz 1124119
 ApplyPatch uas-Do-not-blacklist-ASM1153-disk-enclosures.patch
 ApplyPatch uas-Add-US_FL_NO_ATA_1X-for-2-more-Seagate-disk-encl.patch
-ApplyPatch uas-Add-no-report-opcodes-quirk-for-Simpletech-devic.patch
 
 #rhbz 1115713
 ApplyPatch samsung-laptop-Add-use_native_backlight-quirk-and-en.patch
@@ -2253,6 +2251,9 @@ fi
 #                                    ||----w |
 #                                    ||     ||
 %changelog
+* Fri Feb 06 2015 Justin M. Forbes <jforbes@fedoraproject.org> - 3.18.6-200
+- Linux v3.18.6
+
 * Mon Feb 02 2015 Justin M. Forbes <jforbes@fedoraproject.org> - 3.18.5-201
 - Fixup adjtimex freq validation on 32bit systems (rhbz 1188074)
 
diff --git a/sources b/sources
index 8bf0d43f..81f636ad 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
 9e854df51ca3fef8bfe566dbd7b89241  linux-3.18.tar.xz
 813ccb96f0b379d656e57442c2587ca3  perf-man-3.18.tar.gz
-e8563b2feaa6c33d20d23ac7add9d385  patch-3.18.5.xz
+30aa769974e64fd17a01724d1577a913  patch-3.18.6.xz
diff --git a/uas-Add-no-report-opcodes-quirk-for-Simpletech-devic.patch b/uas-Add-no-report-opcodes-quirk-for-Simpletech-devic.patch
deleted file mode 100644
index 837e472c..00000000
--- a/uas-Add-no-report-opcodes-quirk-for-Simpletech-devic.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From: Hans de Goede <hdegoede@redhat.com>
-Date: Mon, 12 Jan 2015 13:24:31 +0100
-Subject: [PATCH] uas: Add no-report-opcodes quirk for Simpletech devices with
- id 4971:8017
-
-Like some other uas devices these devices hang when a report-opcodes scsi
-command is send to them.
-
-BugLink: https://bugzilla.redhat.com/show_bug.cgi?id=1124119
-Cc: stable@vger.kernel.org # 3.16
-Signed-off-by: Hans de Goede <hdegoede@redhat.com>
----
- drivers/usb/storage/unusual_uas.h | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/drivers/usb/storage/unusual_uas.h b/drivers/usb/storage/unusual_uas.h
-index 9ec4561f6c2c..da3d98c72db1 100644
---- a/drivers/usb/storage/unusual_uas.h
-+++ b/drivers/usb/storage/unusual_uas.h
-@@ -130,3 +130,10 @@ UNUSUAL_DEV(0x4971, 0x1012, 0x0000, 0x9999,
- 		"External HDD",
- 		USB_SC_DEVICE, USB_PR_DEVICE, NULL,
- 		US_FL_IGNORE_UAS),
-+
-+/* Reported-by: Richard Henderson <rth@redhat.com> */
-+UNUSUAL_DEV(0x4971, 0x8017, 0x0000, 0x9999,
-+		"SimpleTech",
-+		"External HDD",
-+		USB_SC_DEVICE, USB_PR_DEVICE, NULL,
-+		US_FL_NO_REPORT_OPCODES),
--- 
-2.1.0
-