This is a note to let you know that I've just added the patch titled USB: fix up incorrect quirk to the 3.14-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: usb-quirk-fix.patch and it can be found in the queue-3.14 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable@xxxxxxxxxxxxxxx> know about it. >From foo@baz Sun Aug 14 17:09:16 CEST 2016 Date: Sun, 14 Aug 2016 17:09:16 +0200 To: Greg KH <gregkh@xxxxxxxxxxxxxxxxxxx> From: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> Subject: USB: fix up incorrect quirk From: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> Ben Hutchings reported that commit ddbe1fca0bcb ("USB: Add device quirk for ASUS T100 Base Station keyboard") was incorrectly ported. This patch fixes up the quirk by putting it in the correct table. Reported-by: Ben Hutchings <ben@xxxxxxxxxxxxxxx> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- drivers/usb/core/quirks.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) --- a/drivers/usb/core/quirks.c +++ b/drivers/usb/core/quirks.c @@ -164,6 +164,10 @@ static const struct usb_device_id usb_qu /* MAYA44USB sound device */ { USB_DEVICE(0x0a92, 0x0091), .driver_info = USB_QUIRK_RESET_RESUME }, + /* ASUS Base Station(T100) */ + { USB_DEVICE(0x0b05, 0x17e0), .driver_info = + USB_QUIRK_IGNORE_REMOTE_WAKEUP }, + /* Action Semiconductor flash disk */ { USB_DEVICE(0x10d6, 0x2200), .driver_info = USB_QUIRK_STRING_FETCH_255 }, @@ -186,10 +190,6 @@ static const struct usb_device_id usb_in { USB_VENDOR_AND_INTERFACE_INFO(0x046d, USB_CLASS_VIDEO, 1, 0), .driver_info = USB_QUIRK_RESET_RESUME }, - /* ASUS Base Station(T100) */ - { USB_DEVICE(0x0b05, 0x17e0), .driver_info = - USB_QUIRK_IGNORE_REMOTE_WAKEUP }, - { } /* terminating entry must be last */ }; Patches currently in stable-queue which might be from gregkh@xxxxxxxxxxxxxxxxxxx are queue-3.14/scsi_lib-correctly-retry-failed-zero-length-req_type_fs-commands.patch queue-3.14/x86-mm-add-barriers-and-document-switch_mm-vs-flush-synchronization.patch queue-3.14/sctp-prevent-soft-lockup-when-sctp_accept-is-called-during-a-timeout-event.patch queue-3.14/mm-migrate-dirty-page-without-clear_page_dirty_for_io-etc.patch queue-3.14/x86-mm-improve-switch_mm-barrier-comments.patch queue-3.14/ib-security-restrict-use-of-the-write-interface.patch queue-3.14/apparmor-fix-ref-count-leak-when-profile-sha1-hash-is-read.patch queue-3.14/arm-oabi-compat-add-missing-access-checks.patch queue-3.14/usb-quirk-fix.patch queue-3.14/usb-fix-invalid-memory-access-in-hub_activate.patch queue-3.14/random-strengthen-input-validation-for-rndaddtoentcnt.patch queue-3.14/keys-64-bit-mips-needs-to-use-compat_sys_keyctl-for-32-bit-userspace.patch queue-3.14/cdc_ncm-do-not-call-usbnet_link_change-from-cdc_ncm_bind.patch queue-3.14/printk-do-cond_resched-between-lines-while-outputting-to-consoles.patch queue-3.14/scsi-remove-scsi_end_request.patch -- 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