Received-SPF: pass (google.com: domain of linux-kernel+bounces-142188-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223;
Feedback-ID: i787e41f1:Fastmail
Date: Fri, 12 Apr 2024 09:58:52 +0200
From: Greg KH <greg@kroah.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Fabio Estevam <festevam@denx.de>,
	Javier Carrasco <javier.carrasco@wolfvision.net>,
	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 usb tree with the usb.current
 tree
Message-ID: <2024041230-slaw-subsiding-9e85@gregkh>
References: <20240412142547.3598ff68@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20240412142547.3598ff68@canb.auug.org.au>

On Fri, Apr 12, 2024 at 02:25:47PM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the usb tree got a conflict in:
> 
>   drivers/usb/misc/onboard_usb_hub.c
> 
> between commit:
> 
>   34b990e9bb54 ("usb: misc: onboard_usb_hub: Disable the USB hub clock on failure")
> 
> from the usb.current tree and commit:
> 
>   31e7f6c015d9 ("usb: misc: onboard_hub: rename to onboard_dev")
> 
> from the usb tree.
> 
> I fixed it up (I deleted this file and applied the following 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.

Thanks, I knew this would happen, I'll apply your fixup when merging the
two branches together.

greg k-h