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

From: Greg KH <[email-masked]>
Date: Tue, 3 May 2022 16:36:48 +0200

On Tue, Apr 26, 2022 at 03:08:42PM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the usb tree got a conflict in:
> 
>   drivers/usb/dwc3/drd.c
> 
> between commit:
> 
>   ab7aa2866d29 ("usb: dwc3: Try usb-role-switch first in dwc3_drd_init")
> 
> from the usb.current tree and commit:
> 
>   0f0101719138 ("usb: dwc3: Don't switch OTG -> peripheral if extcon is present")
> 
> 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/drd.c
> index 8cad9e7d3368,f277bebdaa09..000000000000
> --- a/drivers/usb/dwc3/drd.c
> +++ b/drivers/usb/dwc3/drd.c
> @@@ -585,14 -539,11 +539,10 @@@ int dwc3_drd_init(struct dwc3 *dwc
>   	int ret, irq;
>   
>   	if (ROLE_SWITCH &&
>  -	    device_property_read_bool(dwc->dev, "usb-role-switch")) {
>  -		ret = dwc3_setup_role_switch(dwc);
>  -		if (ret < 0)
>  -			return ret;
>  -	} else if (dwc->edev) {
>  +	    device_property_read_bool(dwc->dev, "usb-role-switch"))
>  +		return dwc3_setup_role_switch(dwc);
>  +
> - 	dwc->edev = dwc3_get_extcon(dwc);
> - 	if (IS_ERR(dwc->edev))
> - 		return PTR_ERR(dwc->edev);
> - 
>  +	if (dwc->edev) {
>   		dwc->edev_nb.notifier_call = dwc3_drd_notifier;
>   		ret = extcon_register_notifier(dwc->edev, EXTCON_USB_HOST,
>   					       &dwc->edev_nb);

This should now be resolved in my tree, thanks!

greg k-h