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] [day] [month] [year] [list]

Date:   Mon, 26 Oct 2020 13:35:35 +0100
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,

On Mon, Oct 26, 2020 at 08:54:21AM +1100, Stephen Rothwell wrote:
> On Thu, 8 Oct 2020 15:20:17 +0200 Maxime Ripard <maxime@...no.tech> wrote:
> >
> > 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.
> > 
> > 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
> 
> I am still getting the same conflict (but between Linus' tree and the
> sunxi tree).  It looks like the sunxi tree has not been updated since
> October 6 ...

Yeah, the PR has never been picked up by arm-soc. I've pushed a new
branch based on 5.10-rc1 on our repo, it should solve the conflict.

Sorry for the inconvenience
Maxime


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