Merge 5.11-rc3 into usb-next

Resolves a merge issue in:
	drivers/usb/dwc3/gadget.c

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

diff --cc drivers/usb/dwc3/core.h
Simple merge

diff --cc drivers/usb/dwc3/gadget.c
index 85736dd6673b26d2205b4b0218d18a7581e076b6,ee44321fee38611910756410e936b92fdd134a98..ff14e5bbd1526a4010253cc3a24104527eb1bd47
--- 1/drivers/usb/dwc3/gadget.c
--- 2/drivers/usb/dwc3/gadget.c
+++ b/drivers/usb/dwc3/gadget.c
@@@ -2212,7 -2148,8 +2215,9 @@@ static int dwc3_gadget_pullup(struct us
                        dwc->ev_buf->lpos = (dwc->ev_buf->lpos + count) %
                                                dwc->ev_buf->length;
                }
 +              dwc->connected = false;
+       } else {
+               __dwc3_gadget_start(dwc);
        }
  
        ret = dwc3_gadget_run_stop(dwc, is_on, false);

diff --cc drivers/usb/gadget/composite.c
Simple merge

diff --cc drivers/usb/gadget/configfs.c
Simple merge

diff --cc drivers/usb/gadget/function/f_printer.c
Simple merge