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 1535FC433EF for ; Fri, 10 Jun 2022 09:22:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1348956AbiFJJWj (ORCPT ); Fri, 10 Jun 2022 05:22:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38760 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1348824AbiFJJWS (ORCPT ); Fri, 10 Jun 2022 05:22:18 -0400 Received: from out5-smtp.messagingengine.com (out5-smtp.messagingengine.com [66.111.4.29]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6148B15434A; Fri, 10 Jun 2022 02:20:20 -0700 (PDT) Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id D93E45C00A4; Fri, 10 Jun 2022 05:20:17 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Fri, 10 Jun 2022 05:20:17 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kroah.com; h=cc :cc:content-type:date:date:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:sender:subject :subject:to:to; s=fm2; t=1654852817; x=1654939217; bh=f1H+DWhyV6 bEImtYz7G/ATvgHdFloSPJtVwvi8rl+34=; b=kEt2Z+26Z1Dy0WDBiZZMW8CA1K wRLPKsTRa44XnoDqtc4tVZUfysSf4K2Nd2fFY3URZL76g/7i1Nvjwyv001O78Qn2 2JdDXE9bAQz7w82oBwsi1wl7Gm2PxQ07tJ9GKRw1VZaTI2gYMurnACi1b4HPMt7l SKEX0Pob5rqse7x6b2GUVjtabOC1R88MUbgmOGlmB+j5dOyQnptlBAQMrH3LSnwR TIT8H7Z+FQmWUog7mT/4592X1/KfczaxRmBhxgHlvoRJnmc35Q7CpKzzzG0zbBIM NZ81xyhxSd7qrd8oQ5iq+Q8tZJ6Su3y9ubzkgjCQzdZ2UfUxu3SFtODG5p4w== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-type:date:date:feedback-id :feedback-id:from:from:in-reply-to:in-reply-to:message-id :mime-version:references:reply-to:sender:subject:subject:to:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm2; t=1654852817; x=1654939217; bh=f1H+DWhyV6bEImtYz7G/ATvgHdFl oSPJtVwvi8rl+34=; b=EBN2OC9WYnd1RqRxhQZOfxvsF7tGI2ix9Um9PazNF78/ SiuxErPtdzqWx72Z4CaWlNK0LTkCGpYlDZRkmeF2Qpmzv8SqSLyEdWjEChrRxQen QVvuH3pjD4xHQhYXQMMYmhE9D0cn580ojl0WAM+yVxxY7Dm8QTbvHUbcp0TpfFHe CVmArbAnwORQDLLAMjG5Y3fUzw5n5y2CDFFoDzBPVxVvMKpGlyzlMT8TRngJZuZo HFlKI1iBE5ndi+/BqvCgvWonCv9zyOl97woJrxtsBQYEKABKpT8cd+kAOJXuJmTq y3Fi86ZwXLMlyc1NWEM+6iHmEDIuXwQP7/bkeaOUOQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvfedrudduuddgudefucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhepfffhvfevuffkfhggtggujgesthdtredttddtvdenucfhrhhomhepifhrvghg ucfmjfcuoehgrhgvgheskhhrohgrhhdrtghomheqnecuggftrfgrthhtvghrnhepheegvd evvdeljeeugfdtudduhfekledtiefhveejkeejuefhtdeufefhgfehkeetnecuvehluhhs thgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepghhrvghgsehkrhhorg hhrdgtohhm X-ME-Proxy: Feedback-ID: i787e41f1:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Fri, 10 Jun 2022 05:20:17 -0400 (EDT) Date: Fri, 10 Jun 2022 11:20:13 +0200 From: Greg KH To: Stephen Rothwell Cc: Arnd Bergmann , Chanwoo Choi , Andrey Smirnov , Dan Carpenter , Linux Kernel Mailing List , Linux Next Mailing List Subject: Re: linux-next: manual merge of the extcon tree with the usb tree Message-ID: References: <20220426152739.62f6836e@canb.auug.org.au> <20220523184254.4e657cd1@canb.auug.org.au> <20220604111841.3887bf65@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20220604111841.3887bf65@canb.auug.org.au> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Sat, Jun 04, 2022 at 11:18:40AM +1000, Stephen Rothwell wrote: > Hi all, > > On Mon, 23 May 2022 18:42:54 +1000 Stephen Rothwell wrote: > > > > 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: > > > > > > 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 > > > 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 > > > --- > > > 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 > :-( I've taken your resolution in the tree now, sorry for the delay. greg k-h