Re: linux-next: manual merge of the usb tree with the rockchip tree

[Greg KH]

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