Merge branch 4.16-rc6 into usb-next

We want the USB fixes in here as well.

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

diff --cc Documentation/devicetree/bindings/usb/usb-xhci.txt
Simple merge

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

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

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

diff --cc drivers/usb/host/xhci.h
Simple merge

diff --cc drivers/usb/typec/fusb302/fusb302.c
Simple merge

diff --cc drivers/usb/typec/tcpm.c
Simple merge