From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Maxime Ripard <mripard@kernel.org>, Chen-Yu Tsai <wens@csie.org>,
Olof Johansson <olof@lixom.net>, Arnd Bergmann <arnd@arndb.de>,
ARM <linux-arm-kernel@lists.infradead.org>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Maxime Ripard <maxime@cerno.tech>,
Yangtao Li <frank@allwinnertech.com>
Subject: linux-next: manual merge of the sunxi tree with the arm-soc tree
Date: Tue, 6 Oct 2020 14:56:37 +1100 [thread overview]
Message-ID: <20201006145637.57d20ba1@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 918 bytes --]
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.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2020-10-06 3:56 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-06 3:56 Stephen Rothwell [this message]
2020-10-08 13:20 ` linux-next: manual merge of the sunxi tree with the arm-soc tree Maxime Ripard
2020-10-25 21:54 ` Stephen Rothwell
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=20201006145637.57d20ba1@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=arnd@arndb.de \
--cc=frank@allwinnertech.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=maxime@cerno.tech \
--cc=mripard@kernel.org \
--cc=olof@lixom.net \
--cc=wens@csie.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).