From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Kevin Hilman <khilman@baylibre.com>,
Carlo Caione <carlo@caione.org>, Olof Johansson <olof@lixom.net>,
Arnd Bergmann <arnd@arndb.de>,
ARM <linux-arm-kernel@lists.infradead.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Neil Armstrong <narmstrong@baylibre.com>,
Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Subject: linux-next: manual merge of the amlogic tree with the arm-soc tree
Date: Wed, 18 Jan 2017 09:55:31 +1100 [thread overview]
Message-ID: <20170118095531.37f33df0@canb.auug.org.au> (raw)
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.
I fixed it up (the latter moved the code modified by the former into
another file, but also incorporated the change from the former) 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
WARNING: multiple messages have this Message-ID (diff)
From: sfr@canb.auug.org.au (Stephen Rothwell)
To: linux-arm-kernel@lists.infradead.org
Subject: linux-next: manual merge of the amlogic tree with the arm-soc tree
Date: Wed, 18 Jan 2017 09:55:31 +1100 [thread overview]
Message-ID: <20170118095531.37f33df0@canb.auug.org.au> (raw)
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.
I fixed it up (the latter moved the code modified by the former into
another file, but also incorporated the change from the former) 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
next reply other threads:[~2017-01-17 22:55 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-17 22:55 Stephen Rothwell [this message]
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
2017-01-18 19:06 ` Kevin Hilman
2017-01-18 19:06 ` Kevin Hilman
-- strict thread matches above, loose matches on Subject: below --
2023-06-22 0:26 Stephen Rothwell
2023-06-22 0:26 ` Stephen Rothwell
2016-09-20 0:19 Stephen Rothwell
2016-09-20 0:19 ` Stephen Rothwell
2016-09-20 21:02 ` Kevin Hilman
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=20170118095531.37f33df0@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=arnd@arndb.de \
--cc=carlo@caione.org \
--cc=khilman@baylibre.com \
--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 \
/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.