Merge 4.14-rc4 into usb-next

This merges in the USB fixes that we need here.

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

diff --cc drivers/usb/gadget/udc/dummy_hcd.c
Simple merge

diff --cc drivers/usb/host/xhci-hub.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
index 7379309f4d1f87b2f44a6c5e9426f1c7dc3c539f,2b48aa4f6b767935c64bc66855e43195dce5b2b9..b966cd8783514a29dc1c2dfa3527e3a675e34327
--- 1/drivers/usb/host/xhci.h
--- 2/drivers/usb/host/xhci.h
+++ b/drivers/usb/host/xhci.h
@@@ -1830,9 -1828,8 +1832,9 @@@ struct xhci_hcd 
  /* For controller with a broken Port Disable implementation */
  #define XHCI_BROKEN_PORT_PED  (1 << 25)
  #define XHCI_LIMIT_ENDPOINT_INTERVAL_7        (1 << 26)
- #define XHCI_U2_DISABLE_WAKE  (1 << 27)
+ /* Reserved. It was XHCI_U2_DISABLE_WAKE */
  #define XHCI_ASMEDIA_MODIFY_FLOWCONTROL       (1 << 28)
 +#define XHCI_HW_LPM_DISABLE   (1 << 29)
  
        unsigned int            num_active_eps;
        unsigned int            limit_active_eps;