Subject: linux-next: manual merge of the usb tree with the usb.current tree

From: Stephen Rothwell <[email-masked]>
Date: Wed, 6 Jan 2021 11:50:14 +1100

Hi all,

Today's linux-next merge of the usb tree got a conflict in:

  drivers/usb/dwc3/gadget.c

between commit:

  a1383b3537a7 ("usb: dwc3: gadget: Restart DWC3 gadget when enabling pullup")

from the usb.current tree and commit:

  77adb8bdf422 ("usb: dwc3: gadget: Allow runtime suspend if UDC unbinded")

from the usb tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/usb/dwc3/gadget.c
index 25f654b79e48,85736dd6673b..000000000000
--- a/drivers/usb/dwc3/gadget.c
+++ b/drivers/usb/dwc3/gadget.c
@@@ -2146,8 -2212,7 +2213,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);