Merge 6.0-rc4 into usb-next

We need the USB fixes in here and this resolves the merge issue in:
	drivers/usb/dwc3/gadget.c

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --cc drivers/usb/dwc3/dwc3-qcom.c
Simple merge

diff --cc drivers/usb/dwc3/gadget.c
index d6c0cb79ace33d9d0ed587a2d79e9d588d97e95c,eca945feeec3e7615935605387b0805cd333933a..3a344ba0b2927f7ae336994f736d914202099a12
--- 1/drivers/usb/dwc3/gadget.c
--- 2/drivers/usb/dwc3/gadget.c
+++ b/drivers/usb/dwc3/gadget.c
@@@ -2569,8 -2563,11 +2566,13 @@@ static int dwc3_gadget_pullup(struct us
                return 0;
        }
  
+       if (dwc->pullups_connected == is_on) {
+               pm_runtime_put(dwc->dev);
+               return 0;
+       }
+ 
 +      synchronize_irq(dwc->irq_gadget);
 +
        if (!is_on) {
                ret = dwc3_gadget_soft_disconnect(dwc);
        } else {

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

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