From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Maxime Ripard <maxime@cerno•tech>
Cc: Chen-Yu Tsai <wens@csie•org>, Olof Johansson <olof@lixom•net>,
Arnd Bergmann <arnd@arndb•de>,
ARM <linux-arm-kernel@lists•infradead.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Yangtao Li <frank@allwinnertech•com>
Subject: Re: linux-next: manual merge of the sunxi tree with the arm-soc tree
Date: Mon, 26 Oct 2020 08:54:21 +1100 [thread overview]
Message-ID: <20201026085421.1536d873@canb.auug.org.au> (raw)
In-Reply-To: <20201008132017.ju5ih5prn4aifeml@gilmour.lan>
[-- Attachment #1: Type: text/plain, Size: 1162 bytes --]
Hi Maxime,
On Thu, 8 Oct 2020 15:20:17 +0200 Maxime Ripard <maxime@cerno•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 ...
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2020-10-25 21:54 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-06 3:56 linux-next: manual merge of the sunxi tree with the arm-soc tree Stephen Rothwell
2020-10-08 13:20 ` Maxime Ripard
2020-10-25 21:54 ` Stephen Rothwell [this message]
2020-10-26 12:35 ` Maxime Ripard
-- strict thread matches above, loose matches on Subject: below --
2017-10-30 12:22 Mark Brown
2017-10-30 13:51 ` Arnd Bergmann
2016-12-08 0:13 Stephen Rothwell
2014-11-27 23:36 Stephen Rothwell
2014-11-28 8:37 ` Maxime Ripard
2014-11-24 0:16 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201026085421.1536d873@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=arnd@arndb$(echo .)de \
--cc=frank@allwinnertech$(echo .)com \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=maxime@cerno$(echo .)tech \
--cc=olof@lixom$(echo .)net \
--cc=wens@csie$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox