3.18.6-100.fc20.gnu

3 files changed, 11 insertions, 40 deletions

diff --git a/freed-ora/current/f20/kernel.spec b/freed-ora/current/f20/kernel.spec
index e4ef648f1..cf385ba0e 100644
--- a/freed-ora/current/f20/kernel.spec
+++ b/freed-ora/current/f20/kernel.spec
@@ -62,7 +62,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 101
+%global baserelease 100
 %global fedora_build %{baserelease}
 
 # base_sublevel is the kernel version we're starting with and patching
@@ -112,7 +112,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
 # Is it a -stable RC?
 %define stable_rc 0
 # Set rpm version accordingly
@@ -799,7 +799,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
@@ -1585,7 +1584,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
@@ -2432,6 +2430,12 @@ fi
 #                 ||----w |
 #                 ||     ||
 %changelog
+* Sat Feb  7 2015 Alexandre Oliva <lxoliva@fsfla.org> -libre
+- GNU Linux-libre 3.18.6-gnu.
+
+* Fri Feb 06 2015 Justin M. Forbes <jforbes@fedoraproject.org> - 3.18.6-100
+- Linux v3.18.6
+
 * Mon Feb 02 2015 Justin M. Forbes <jforbes@fedoraproject.org> - 3.18.5-101
 - Fixup adjtimex freq validation on 32bit systems (rhbz 1188074)
 
@@ -2439,7 +2443,7 @@ fi
 - CVE-XXXX-XXX DoS due to routing packets to too many different dsts/too fast (rhbz 1183744 1188347)
 
 * Fri Jan 30 2015 Alexandre Oliva <lxoliva@fsfla.org> -libre
-- GNU Linux-libre 3.18.5-gnu
+- GNU Linux-libre 3.18.5-gnu.
 
 * Fri Jan 30 2015 Justin M. Forbes <jforbes@fedoraproject.org> - 3.18.5-100
 - Linux v3.18.5
@@ -2449,7 +2453,7 @@ fi
 - Disable i915 state checks
 
 * Wed Jan 28 2015 Alexandre Oliva <lxoliva@fsfla.org> -libre
-- GNU Linux-libre 3.18.4-gnu
+- GNU Linux-libre 3.18.4-gnu.
 
 * Wed Jan 28 2015 Justin M. Forbes <jforbes@fedoraproject.org> - 3.18.4-100
 - Linux v3.18.4
diff --git a/freed-ora/current/f20/sources b/freed-ora/current/f20/sources
index aaf3dca36..4b138c33c 100644
--- a/freed-ora/current/f20/sources
+++ b/freed-ora/current/f20/sources
@@ -1,3 +1,3 @@
 b3c2a6827813398dde7e8a2d4e02a2c3  linux-libre-3.18-gnu.tar.xz
 813ccb96f0b379d656e57442c2587ca3  perf-man-3.18.tar.gz
-e8563b2feaa6c33d20d23ac7add9d385  patch-3.18.5.xz
+30aa769974e64fd17a01724d1577a913  patch-3.18.6.xz
diff --git a/freed-ora/current/f20/uas-Add-no-report-opcodes-quirk-for-Simpletech-devic.patch b/freed-ora/current/f20/uas-Add-no-report-opcodes-quirk-for-Simpletech-devic.patch
deleted file mode 100644
index 837e472cb..000000000
--- a/freed-ora/current/f20/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
-