From: Kevin Hilman <khilman@baylibre.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Arnd Bergmann <arnd@arndb.de>,
Neil Armstrong <narmstrong@baylibre.com>,
Martin Blumenstingl <martin.blumenstingl@googlemail.com>,
linux-kernel@vger.kernel.org, Olof Johansson <olof@lixom.net>,
linux-next@vger.kernel.org, Carlo Caione <carlo@caione.org>,
ARM <linux-arm-kernel@lists.infradead.org>
Subject: Re: linux-next: manual merge of the amlogic tree with the arm-soc tree
Date: Wed, 18 Jan 2017 11:06:53 -0800 [thread overview]
Message-ID: <m2inpc192q.fsf@baylibre.com> (raw)
In-Reply-To: <20170118095531.37f33df0@canb.auug.org.au> (Stephen Rothwell's message of "Wed, 18 Jan 2017 09:55:31 +1100")
Stephen Rothwell <sfr@canb.auug.org.au> writes:
> Hi all,
>
> Today's linux-next merge of the amlogic tree got a conflict in:
>
> arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi
>
> between commit:
>
> f7bcd4b6f698 ("ARM64: dts: meson-gxbb-odroidc2: Disable SCPI DVFS")
>
> from the arm-soc tree and commit:
>
> 47961f1353b8 ("ARM64: dts: meson-gx: move the SCPI and SRAM nodes to meson-gx")
>
> from the amlogic tree.
The latter has been dropped from the amlogic pending some ongoing
discussion, but I forgot to push an updated for-next. That's remedied
now.
Kevin
next prev parent reply other threads:[~2017-01-18 19:06 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-17 22:55 linux-next: manual merge of the amlogic tree with the arm-soc tree Stephen Rothwell
2017-01-18 19:06 ` Kevin Hilman [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-06-22 0:26 Stephen Rothwell
2016-09-20 0:19 Stephen Rothwell
2016-09-20 21:02 ` Kevin Hilman
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=m2inpc192q.fsf@baylibre.com \
--to=khilman@baylibre.com \
--cc=arnd@arndb.de \
--cc=carlo@caione.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=martin.blumenstingl@googlemail.com \
--cc=narmstrong@baylibre.com \
--cc=olof@lixom.net \
--cc=sfr@canb.auug.org.au \
/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).