From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 23BF2C433F5 for ; Mon, 23 May 2022 08:43:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232042AbiEWInK (ORCPT ); Mon, 23 May 2022 04:43:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40116 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231969AbiEWInG (ORCPT ); Mon, 23 May 2022 04:43:06 -0400 Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4DEBBFA; Mon, 23 May 2022 01:43:03 -0700 (PDT) Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4L69nr0cDkz4xDK; Mon, 23 May 2022 18:42:55 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1653295376; bh=aXPebDNLN91z03b5RN6d6nAEkt/4cWPSQfapcTUcIos=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=a1MMDRymvjxs6LOwWrMHgzW/2YJ2C6JS8L7oqoQhCcsGIpLsSo237y4bE3M28liXV 80WOBEkYZCDgk5aEhqyVKdnVJ+IzIuKTmZYLAvC/04fZ2JomKp+tyfC0cU9mx86pj2 YrkcOvWvw0n+G1FM2XAQOPw3QmZwPDKI7pZ9I7VuHVdREtOZFI8IW3RyEQETVKnbp9 z4KrrT8lcVUsNWPXHCDuN7doQof2KWfVh/aKwQd3NUpJnqI+2VajuVB9AlUJErbnUJ hXk/V4VsV30ozhSMPMmn4oYI7XU48Aj5ga/AeH0wwmQKcpHzCUKRv8Qxvjvi0+mx32 s2ktec1V1RI5A== Date: Mon, 23 May 2022 18:42:54 +1000 From: Stephen Rothwell To: Greg KH , Arnd Bergmann Cc: Chanwoo Choi , Andrey Smirnov , Dan Carpenter , Greg Kroah-Hartman , Linux Kernel Mailing List , Linux Next Mailing List Subject: Re: linux-next: manual merge of the extcon tree with the usb tree Message-ID: <20220523184254.4e657cd1@canb.auug.org.au> In-Reply-To: <20220426152739.62f6836e@canb.auug.org.au> References: <20220426152739.62f6836e@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/tPzk1NySu0SgGqug=pEZHG/"; protocol="application/pgp-signature"; micalg=pgp-sha256 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --Sig_/tPzk1NySu0SgGqug=pEZHG/ Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, On Tue, 26 Apr 2022 15:27:39 +1000 Stephen Rothwell = wrote: > > Today's linux-next merge of the extcon tree got a conflict in: >=20 > drivers/usb/dwc3/drd.c >=20 > between commit: >=20 > 0f0101719138 ("usb: dwc3: Don't switch OTG -> peripheral if extcon is p= resent") >=20 > from the usb tree and commit: >=20 > 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. >=20 > 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. >=20 > From: Stephen Rothwell > Date: Tue, 26 Apr 2022 15:24:04 +1000 > Subject: [PATCH] fixup for "usb: dwc3: Don't switch OTG -> peripheral if = extcon is present" >=20 > Signed-off-by: Stephen Rothwell > --- > drivers/usb/dwc3/core.c | 9 ++------- > 1 file changed, 2 insertions(+), 7 deletions(-) >=20 > 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 d= wc3 *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) =3D=3D= 0) { > - edev =3D extcon_get_extcon_dev(name); > - if (!edev) > - return ERR_PTR(-EPROBE_DEFER); > - > - return edev; > - } > + if (device_property_read_string(dev, "linux,extcon-name", &name) =3D=3D= 0) > + return extcon_get_extcon_dev(name); > =20 > /* > * Try to get an extcon device from the USB PHY controller's "port" > --=20 > 2.35.1 This is now a conflict between the char-misc tree and the usb tree. --=20 Cheers, Stephen Rothwell --Sig_/tPzk1NySu0SgGqug=pEZHG/ Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmKLSQ4ACgkQAVBC80lX 0GyijAf+OXLV+QcxJzCrVAqiXZoHzNgJLM0TxhwodE58Dq3C7QisiFwnZc1wSwTZ GlT9pAUNgW4ktjoHqGDSvQyXBTXElN8huWCKcbpLEaR6os6Qq8wS+xntd2f8GrPI 28ytxWM7z1LruC/3erxWfQzxbzR1if/4hOFOn85sp4GL8grn2gFforn48HHHdCO0 YcOc5SAA5ZudyDEjNptjtmH/fi8gnVeAvGiU46d8RG1QpAt8vhnj8dW1eQZ6vcUV PomFEqGsLhs08Jo2AQkbyi0X2WZxxavPNVSPNEIxpQFkqCW4uBicOstTCRn7Ei9p 3BRMYNw+4wkjJGojk8oU2q6sz//spw== =5xqb -----END PGP SIGNATURE----- --Sig_/tPzk1NySu0SgGqug=pEZHG/--