Gentoo Archives: gentoo-commits

From: Mike Pagano <mpagano@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/linux-patches:4.14 commit in: /
Date: Wed, 05 Feb 2020 17:22:29
Message-Id: 1580923321.e6b4d5ad3441092108ba4357e9286ade989f6292.mpagano@gentoo
1 commit: e6b4d5ad3441092108ba4357e9286ade989f6292
2 Author: Mike Pagano <mpagano <AT> gentoo <DOT> org>
3 AuthorDate: Wed Feb 5 17:22:01 2020 +0000
4 Commit: Mike Pagano <mpagano <AT> gentoo <DOT> org>
5 CommitDate: Wed Feb 5 17:22:01 2020 +0000
6 URL: https://gitweb.gentoo.org/proj/linux-patches.git/commit/?id=e6b4d5ad
7
8 Remove redundant patch
9
10 Patch removed:
11 2500_usb-storage-Disable-UAS-on-JMicron-SATA-enclosure.patch
12
13 Signed-off-by: Mike Pagano <mpagano <AT> gentoo.org>
14
15 0000_README | 4 ---
16 ...age-Disable-UAS-on-JMicron-SATA-enclosure.patch | 40 ----------------------
17 2 files changed, 44 deletions(-)
18
19 diff --git a/0000_README b/0000_README
20 index 811495e..d6b7cdc 100644
21 --- a/0000_README
22 +++ b/0000_README
23 @@ -747,10 +747,6 @@ Patch: 2300_enable-poweroff-on-Mac-Pro-11.patch
24 From: http://kernel.ubuntu.com/git/ubuntu/ubuntu-xenial.git/patch/drivers/pci/quirks.c?id=5080ff61a438f3dd80b88b423e1a20791d8a774c
25 Desc: Workaround to enable poweroff on Mac Pro 11. See bug #601964.
26
27 -Patch: 2500_usb-storage-Disable-UAS-on-JMicron-SATA-enclosure.patch
28 -From: https://bugzilla.redhat.com/show_bug.cgi?id=1260207#c5
29 -Desc: Add UAS disable quirk. See bug #640082.
30 -
31 Patch: 2600_enable-key-swapping-for-apple-mac.patch
32 From: https://github.com/free5lot/hid-apple-patched
33 Desc: This hid-apple patch enables swapping of the FN and left Control keys and some additional on some apple keyboards. See bug #622902
34
35 diff --git a/2500_usb-storage-Disable-UAS-on-JMicron-SATA-enclosure.patch b/2500_usb-storage-Disable-UAS-on-JMicron-SATA-enclosure.patch
36 deleted file mode 100644
37 index 0dd93ef..0000000
38 --- a/2500_usb-storage-Disable-UAS-on-JMicron-SATA-enclosure.patch
39 +++ /dev/null
40 @@ -1,40 +0,0 @@
41 -From d02a55182307c01136b599fd048b4679f259a84e Mon Sep 17 00:00:00 2001
42 -From: Laura Abbott <labbott@×××××××××××××.org>
43 -Date: Tue, 8 Sep 2015 09:53:38 -0700
44 -Subject: [PATCH] usb-storage: Disable UAS on JMicron SATA enclosure
45 -
46 -Steve Ellis reported incorrect block sizes and alignement
47 -offsets with a SATA enclosure. Adding a quirk to disable
48 -UAS fixes the problems.
49 -
50 -Reported-by: Steven Ellis <sellis@××××××.com>
51 -Signed-off-by: Laura Abbott <labbott@×××××××××××××.org>
52 ----
53 - drivers/usb/storage/unusual_uas.h | 7 +++++--
54 - 1 file changed, 5 insertions(+), 2 deletions(-)
55 -
56 -diff --git a/drivers/usb/storage/unusual_uas.h b/drivers/usb/storage/unusual_uas.h
57 -index c85ea53..216d93d 100644
58 ---- a/drivers/usb/storage/unusual_uas.h
59 -+++ b/drivers/usb/storage/unusual_uas.h
60 -@@ -141,12 +141,15 @@ UNUSUAL_DEV(0x2109, 0x0711, 0x0000, 0x9999,
61 - USB_SC_DEVICE, USB_PR_DEVICE, NULL,
62 - US_FL_NO_ATA_1X),
63 -
64 --/* Reported-by: Takeo Nakayama <javhera@×××.com> */
65 -+/*
66 -+ * Initially Reported-by: Takeo Nakayama <javhera@×××.com>
67 -+ * UAS Ignore Reported by Steven Ellis <sellis@××××××.com>
68 -+ */
69 - UNUSUAL_DEV(0x357d, 0x7788, 0x0000, 0x9999,
70 - "JMicron",
71 - "JMS566",
72 - USB_SC_DEVICE, USB_PR_DEVICE, NULL,
73 -- US_FL_NO_REPORT_OPCODES),
74 -+ US_FL_NO_REPORT_OPCODES | US_FL_IGNORE_UAS),
75 -
76 - /* Reported-by: Hans de Goede <hdegoede@××××××.com> */
77 - UNUSUAL_DEV(0x4971, 0x1012, 0x0000, 0x9999,
78 ---
79 -2.4.3
80 -