Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 as permitted sender) client-ip=23.128.96.31;
Feedback-ID: i787e41f1:Fastmail
Date:   Wed, 25 Oct 2023 08:22:30 +0200
From:   Greg KH <greg@kroah.com>
To:     Stephen Rothwell <sfr@canb.auug.org.au>
Cc:     Heiko Stuebner <heiko@sntech.de>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Sascha Hauer <s.hauer@pengutronix.de>,
        Sebastian Reichel <sebastian.reichel@collabora.com>
Subject: Re: linux-next: manual merge of the usb tree with the rockchip tree
Message-ID: <2023102520-salvage-fancied-b186@gregkh>
References: <20231025143326.1ae29596@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20231025143326.1ae29596@canb.auug.org.au>
Precedence: bulk

On Wed, Oct 25, 2023 at 02:33:26PM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the usb tree got a conflict in:
> 
>   arch/arm64/boot/dts/rockchip/rk3588s.dtsi
> 
> between commit:
> 
>   5a6976b1040a ("arm64: dts: rockchip: Add DFI to rk3588s")
> 
> from the rockchip tree and commit:
> 
>   bbd3778da16b ("arm64: dts: rockchip: rk3588s: Add USB3 host controller")
> 
> from the usb tree.
> 
> I fixed it up (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.

Looks good to me, thanks

greg k-h