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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <2023102520-salvage-fancied-b186@gregkh>
Date:   Wed, 25 Oct 2023 08:22:30 +0200
From:   Greg KH <greg@...ah.com>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     Heiko Stuebner <heiko@...ech.de>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Sascha Hauer <s.hauer@...gutronix.de>,
        Sebastian Reichel <sebastian.reichel@...labora.com>
Subject: Re: linux-next: manual merge of the usb tree with the rockchip tree

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