linux-kernel - Re: linux-next: manual merge of the extcon tree with the usb tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:   Sat, 4 Jun 2022 11:18:40 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Greg KH <greg@...ah.com>, Arnd Bergmann <arnd@...db.de>
Cc:     Chanwoo Choi <cw00.choi@...sung.com>,
        Andrey Smirnov <andrew.smirnov@...il.com>,
        Dan Carpenter <dan.carpenter@...cle.com>,
        Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>
Subject: Re: linux-next: manual merge of the extcon tree with the usb tree

Hi all,

On Mon, 23 May 2022 18:42:54 +1000 Stephen Rothwell <sfr@...b.auug.org.au> wrote:
>
> On Tue, 26 Apr 2022 15:27:39 +1000 Stephen Rothwell <sfr@...b.auug.org.au> wrote:
> >
> > Today's linux-next merge of the extcon tree got a conflict in:
> > 
> >   drivers/usb/dwc3/drd.c
> > 
> > between commit:
> > 
> >   0f0101719138 ("usb: dwc3: Don't switch OTG -> peripheral if extcon is present")
> > 
> > from the usb tree and commit:
> > 
> >   88490c7f43c4 ("extcon: Fix extcon_get_extcon_dev() error handling")  
> 
> This is now commit
> 
>   58e4a2d27d32 ("extcon: Fix extcon_get_extcon_dev() error handling")
> 
> > from the extcon tree.
> > 
> > I fixed it up (the former moved the code modified by the latter, so I
> > used the former version of this files and added the following merge fix
> > patch) 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.
> > 
> > From: Stephen Rothwell <sfr@...b.auug.org.au>
> > Date: Tue, 26 Apr 2022 15:24:04 +1000
> > Subject: [PATCH] fixup for "usb: dwc3: Don't switch OTG -> peripheral if extcon is present"
> > 
> > Signed-off-by: Stephen Rothwell <sfr@...b.auug.org.au>
> > ---
> >  drivers/usb/dwc3/core.c | 9 ++-------
> >  1 file changed, 2 insertions(+), 7 deletions(-)
> > 
> > diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c
> > index 2345a54b848b..950e238c65bf 100644
> > --- a/drivers/usb/dwc3/core.c
> > +++ b/drivers/usb/dwc3/core.c
> > @@ -1649,13 +1649,8 @@ static struct extcon_dev *dwc3_get_extcon(struct dwc3 *dwc)
> >  	 * This device property is for kernel internal use only and
> >  	 * is expected to be set by the glue code.
> >  	 */
> > -	if (device_property_read_string(dev, "linux,extcon-name", &name) == 0) {
> > -		edev = extcon_get_extcon_dev(name);
> > -		if (!edev)
> > -			return ERR_PTR(-EPROBE_DEFER);
> > -
> > -		return edev;
> > -	}
> > +	if (device_property_read_string(dev, "linux,extcon-name", &name) == 0)
> > +		return extcon_get_extcon_dev(name);
> >  
> >  	/*
> >  	 * Try to get an extcon device from the USB PHY controller's "port"
> > -- 
> > 2.35.1  
> 
> This is now a conflict between the char-misc tree and the usb tree.

This merge resolution seems to have been lost somewhere along the way
:-(

-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped