From: Greg KH <greg@kroah.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Chanwoo Choi <cw00.choi@samsung.com>,
Andrey Smirnov <andrew.smirnov@gmail.com>,
Dan Carpenter <dan.carpenter@oracle.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: manual merge of the extcon tree with the usb tree
Date: Tue, 26 Apr 2022 11:42:08 +0200 [thread overview]
Message-ID: <Yme+cFpA19sWT2+g@kroah.com> (raw)
In-Reply-To: <20220426152739.62f6836e@canb.auug.org.au>
On Tue, Apr 26, 2022 at 03:27:39PM +1000, Stephen Rothwell wrote:
> Hi all,
>
> 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")
>
> 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@canb.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@canb.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
>
> --
> Cheers,
> Stephen Rothwell
Resolution looks good to me, thanks!
greg k-h
next prev parent reply other threads:[~2022-04-26 10:17 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-26 5:27 linux-next: manual merge of the extcon tree with the usb tree Stephen Rothwell
2022-04-26 9:42 ` Greg KH [this message]
2022-05-23 8:42 ` Stephen Rothwell
2022-06-04 1:18 ` Stephen Rothwell
2022-06-04 10:00 ` Greg KH
2022-06-10 9:20 ` Greg KH
2022-06-10 10:51 ` Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=Yme+cFpA19sWT2+g@kroah.com \
--to=greg@kroah.com \
--cc=andrew.smirnov@gmail.com \
--cc=cw00.choi@samsung.com \
--cc=dan.carpenter@oracle.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).