Hi, On 21-04-15 11:11, Greg Kroah-Hartman wrote:
On Tue, Apr 21, 2015 at 11:00:25AM +0200, Hans de Goede wrote:Our detection logic to avoid doing UAS on ASM1051 bridge chips causes problems with newer ASM1153 disk enclosures in 2 ways: 1) Some ASM1153 disk enclosures re-use the ASM1051 device-id of 5106, which we assume is always an ASM1051, so remove the quirk for 5106, and instead use the same detection logic as we already use for device-id 55aa, which is used for all of ASM1051, ASM1053 and ASM1153 devices <sigh>. 2) Our detection logic to differentiate between ASM1051 and ASM1053 sees ASM1153 devices as ASM1051 because they have 32 streams like ASM1051 devs. Luckily the ASM1153 descriptors are not 100% identical, unlike the previous models the ASM1153 has bMaxPower == 0, so use that to differentiate it. Signed-off-by: Hans de Goede <hdegoede@xxxxxxxxxx> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- drivers/usb/storage/uas-detect.h | 33 ++++++++++++++++++++++++++++----- drivers/usb/storage/unusual_uas.h | 8 -------- 2 files changed, 28 insertions(+), 13 deletions(-)What is the git commit id of this in Linus's tree? What stable tree(s) do you want this in?
Commit id in Linus' tree is 078fd7d6308a30121b80c297e9b38a2e53711942 as mentioned in the cover letter this is intended for stable trees back to 3.16. Regards, Hans -- To unsubscribe from this list: send the line "unsubscribe stable" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html