Received-SPF: pass (google.com: domain of linux-kernel+bounces-80572-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) client-ip=147.75.48.161;
Feedback-ID: i787e41f1:Fastmail
Date: Mon, 26 Feb 2024 06:55:10 +0100
From: Greg KH <greg@kroah.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Heikki Krogerus <heikki.krogerus@linux.intel.com>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Linux Next Mailing List <linux-next@vger.kernel.org>,
	Xu Yang <xu.yang_2@nxp.com>
Subject: Re: linux-next: manual merge of the usb tree with the usb.current
 tree
Message-ID: <2024022655-dweller-shining-fc54@gregkh>
References: <20240220143919.40257e7b@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20240220143919.40257e7b@canb.auug.org.au>

On Tue, Feb 20, 2024 at 02:39:19PM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the usb tree got a conflict in:
> 
>   drivers/usb/roles/class.c
> 
> between commit:
> 
>   b787a3e78175 ("usb: roles: don't get/set_role() when usb_role_switch is unregistered")
> 
> from the usb.current tree and commit:
> 
>   9a270ec7bfb0 ("usb: roles: Link the switch to its connector")
> 
> from the usb tree.
> 
> I fixed it up (I think - see below) 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.

Should now be fixed up in my usb-next branch, thanks!

greg k-h