From: Arnd Bergmann <arnd@arndb.de>
To: Mark Brown <broonie@kernel.org>
Cc: Rob Herring <robh@kernel.org>,
Maxime Ripard <maxime.ripard@free-electrons.com>,
Chen-Yu Tsai <wens@csie.org>,
Linux ARM <linux-arm-kernel@lists.infradead.org>,
Linux-Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: Re: linux-next: manual merge of the sunxi tree with the arm-soc tree
Date: Mon, 30 Oct 2017 14:51:13 +0100 [thread overview]
Message-ID: <CAK8P3a12bGTr1-royZZeuu69kD+59MhVZeJJ-8iVviGg33hA-w@mail.gmail.com> (raw)
In-Reply-To: <20171030122200.z5sj2riar4vfoiwo@sirena.co.uk>
On Mon, Oct 30, 2017 at 1:22 PM, Mark Brown <broonie@kernel.org> wrote:
> Hi all,
>
> Today's linux-next merge of the sunxi tree got a conflict in:
>
> arch/arm/boot/dts/sunxi-h3-h5.dtsi
> arch/arm/boot/dts/sun7i-a20.dtsi
> arch/arm/boot/dts/sun6i-a31.dtsi
> arch/arm/boot/dts/sun4i-a10.dtsi
>
> between commit:
>
> 8dccafaa281aa1 ("arm: dts: fix unit-address leading 0s")
>
> from the arm-soc tree and various commits from the sunxi 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.
Thanks!
I think I did the same merge when I pulled in the sunxi/dt branch
today, so it should be resolved next time.
Arnd
next prev parent reply other threads:[~2017-10-30 13:51 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-30 12:22 linux-next: manual merge of the sunxi tree with the arm-soc tree Mark Brown
2017-10-30 13:51 ` Arnd Bergmann [this message]
-- strict thread matches above, loose matches on Subject: below --
2020-10-06 3:56 Stephen Rothwell
2020-10-08 13:20 ` Maxime Ripard
2020-10-25 21:54 ` Stephen Rothwell
2020-10-26 12:35 ` Maxime Ripard
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=CAK8P3a12bGTr1-royZZeuu69kD+59MhVZeJJ-8iVviGg33hA-w@mail.gmail.com \
--to=arnd@arndb.de \
--cc=broonie@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=maxime.ripard@free-electrons.com \
--cc=robh@kernel.org \
--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).