Merge 4.15-rc8 into usb-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 15 Jan 2018 14:00:11 +0000 (15:00 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 15 Jan 2018 14:00:11 +0000 (15:00 +0100)
commitc182ce9bc8c85a623c71a23bcd6768045126c289
tree73fb6561bbec5d89cba74492c149f3012e275afa
parent2da050e4f151c458df909780843067e7c2d11ec2
parenta8750ddca918032d6349adbf9a4b6555e7db20da
Merge 4.15-rc8 into usb-next

We want the USB fixes in here as well for merge issues.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/usb/storage/unusual_uas.h
drivers/usb/usbip/usbip_common.c