linux-kernel - Re: linux-next: manual merge of the sunxi tree with the arm-soc 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: Windows password security audit tool. GUI, reports in PDF.

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

Message-ID: <20201008132017.ju5ih5prn4aifeml@gilmour.lan>
Date:   Thu, 8 Oct 2020 15:20:17 +0200
From:   Maxime Ripard <maxime@...no.tech>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     Chen-Yu Tsai <wens@...e.org>, Olof Johansson <olof@...om.net>,
        Arnd Bergmann <arnd@...db.de>,
        ARM <linux-arm-kernel@...ts.infradead.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Yangtao Li <frank@...winnertech.com>
Subject: Re: linux-next: manual merge of the sunxi tree with the arm-soc tree

Hi Stephen,

On Tue, Oct 06, 2020 at 02:56:37PM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the sunxi tree got a conflict in:
> 
>   arch/arm64/boot/dts/allwinner/sun50i-a100.dtsi
> 
> between commit:
> 
>   0dea1794f3b4 ("arm64: allwinner: A100: add the basical Allwinner A100 DTSI file")
> 
> from the arm-soc tree and commit:
> 
>   7e66a778cb8b ("arm64: allwinner: A100: add the basical Allwinner A100 DTSI file")
> 
> from the sunxi tree.
> 
> These are 2 versions of the same patch.  For now I am just using the
> version in the arm-soc tree ... please sort this out.
> 
> I fixed it up (see above) 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.

The branch in arm-soc has a build breakage (that doesn't happen in
linux-next since the clk tree has the commit to fix it) so I sent a new
PR

Once that PR is in arm-soc, I guess that merge issue will go away

maxime

Download attachment "signature.asc" of type "application/pgp-signature" (229 bytes)