Merge 4.15-rc4 into usb-next

We want the USB fixes in here as well.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --cc drivers/usb/core/devio.c
Simple merge

diff --cc drivers/usb/core/hub.c
Simple merge

diff --cc drivers/usb/host/xhci-mem.c
Simple merge

diff --cc drivers/usb/host/xhci-ring.c
Simple merge

diff --cc drivers/usb/storage/unusual_uas.h
Simple merge

diff --cc drivers/usb/usbip/stub_rx.c
Simple merge