From: Kevin Hilman <khilman@baylibre.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Carlo Caione <carlo@caione.org>, Olof Johansson <olof@lixom.net>,
Arnd Bergmann <arnd@arndb.de>,
ARM <linux-arm-kernel@lists.infradead.org>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Jerome Brunet <jbrunet@baylibre.com>
Subject: Re: linux-next: manual merge of the amlogic tree with the arm-soc tree
Date: Tue, 20 Sep 2016 14:02:25 -0700 [thread overview]
Message-ID: <7hk2e6i8ta.fsf@baylibre.com> (raw)
In-Reply-To: <20160920101938.5d46a0ab@canb.auug.org.au> (Stephen Rothwell's message of "Tue, 20 Sep 2016 10:19:38 +1000")
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-p20x.dtsi
>
> between commit:
>
> 8735053d7968 ("ARM64: dts: meson-gxbb-p20x: Enable USB Nodes")
>
> from the arm-soc tree and commit:
>
> d82801a385a1 ("ARM64: dts: meson-gxbb-p20x: Enable USB Nodes")
>
> from the amlogic tree.
>
> This patch was modified before being merged into the arm-soc tree.
> Please clean up the amlogic tree.
Cleaned up.
I forgot to push the updated amlogic/for-next after sending pull
requests to arm-soc.
Kevin
WARNING: multiple messages have this Message-ID (diff)
From: khilman@baylibre.com (Kevin Hilman)
To: linux-arm-kernel@lists.infradead.org
Subject: linux-next: manual merge of the amlogic tree with the arm-soc tree
Date: Tue, 20 Sep 2016 14:02:25 -0700 [thread overview]
Message-ID: <7hk2e6i8ta.fsf@baylibre.com> (raw)
In-Reply-To: <20160920101938.5d46a0ab@canb.auug.org.au> (Stephen Rothwell's message of "Tue, 20 Sep 2016 10:19:38 +1000")
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-p20x.dtsi
>
> between commit:
>
> 8735053d7968 ("ARM64: dts: meson-gxbb-p20x: Enable USB Nodes")
>
> from the arm-soc tree and commit:
>
> d82801a385a1 ("ARM64: dts: meson-gxbb-p20x: Enable USB Nodes")
>
> from the amlogic tree.
>
> This patch was modified before being merged into the arm-soc tree.
> Please clean up the amlogic tree.
Cleaned up.
I forgot to push the updated amlogic/for-next after sending pull
requests to arm-soc.
Kevin
next prev parent reply other threads:[~2016-09-20 21:02 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-20 0:19 linux-next: manual merge of the amlogic tree with the arm-soc tree Stephen Rothwell
2016-09-20 0:19 ` Stephen Rothwell
2016-09-20 21:02 ` Kevin Hilman [this message]
2016-09-20 21:02 ` Kevin Hilman
-- strict thread matches above, loose matches on Subject: below --
2017-01-17 22:55 Stephen Rothwell
2017-01-17 22:55 ` Stephen Rothwell
2017-01-18 19:06 ` Kevin Hilman
2017-01-18 19:06 ` Kevin Hilman
2017-01-18 19:06 ` Kevin Hilman
2023-06-22 0:26 Stephen Rothwell
2023-06-22 0:26 ` 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=7hk2e6i8ta.fsf@baylibre.com \
--to=khilman@baylibre.com \
--cc=arnd@arndb.de \
--cc=carlo@caione.org \
--cc=jbrunet@baylibre.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.