From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Jason Cooper <jason@lakedaemon.net>,
andrew@lunn.ch, gregory.clement@free-electrons.com,
Olof Johansson <olof@lixom.net>, Arnd Bergmann <arnd@arndb.de>,
linux-arm-kernel@lists.infradead.org
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Evgeni Dobrev <evgeni@studio-punkt.com>,
Peter Robinson <pbrobinson@gmail.com>
Subject: linux-next: manual merge of the mvebu tree with the arm-soc tree
Date: Tue, 13 Jan 2015 11:20:16 +1100 [thread overview]
Message-ID: <20150113112016.2db3f982@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1731 bytes --]
Hi all,
Today's linux-next merge of the mvebu tree got a conflict in
arch/arm/boot/dts/Makefile between commit 6f1650f15bc4 ("ARM: dts: Only
build dtb if associated Arch and/or SoC is enabled") from the arm-soc
tree and commit dd7d2be1d2b8 ("Kirkwood: add support for Seagate
BlackArmor NAS220") from the mvebu tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/arm/boot/dts/Makefile
index abb810f1fe29,17ee1d6a0ac0..000000000000
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@@ -112,24 -101,18 +112,25 @@@ dtb-$(CONFIG_ARCH_EXYNOS5) +=
exynos5440-sd5v1.dtb \
exynos5440-ssdk5440.dtb \
exynos5800-peach-pi.dtb
-dtb-$(CONFIG_ARCH_HI3xxx) += hi3620-hi4511.dtb
-dtb-$(CONFIG_ARCH_HIX5HD2) += hisi-x5hd2-dkb.dtb
-dtb-$(CONFIG_ARCH_HIGHBANK) += highbank.dtb \
+dtb-$(CONFIG_ARCH_HI3xxx) += \
+ hi3620-hi4511.dtb
+dtb-$(CONFIG_ARCH_HIX5HD2) += \
+ hisi-x5hd2-dkb.dtb
+dtb-$(CONFIG_ARCH_HIGHBANK) += \
+ highbank.dtb \
ecx-2000.dtb
-dtb-$(CONFIG_ARCH_HIP04) += hip04-d01.dtb
-dtb-$(CONFIG_ARCH_INTEGRATOR) += integratorap.dtb \
+dtb-$(CONFIG_ARCH_HIP04) += \
+ hip04-d01.dtb
+dtb-$(CONFIG_ARCH_INTEGRATOR) += \
+ integratorap.dtb \
integratorcp.dtb
-dtb-$(CONFIG_ARCH_KEYSTONE) += k2hk-evm.dtb \
+dtb-$(CONFIG_ARCH_KEYSTONE) += \
+ k2hk-evm.dtb \
k2l-evm.dtb \
k2e-evm.dtb
-dtb-$(CONFIG_MACH_KIRKWOOD) += kirkwood-b3.dtb \
+dtb-$(CONFIG_MACH_KIRKWOOD) += \
+ kirkwood-b3.dtb \
+ kirkwood-blackarmor-nas220.dtb \
kirkwood-cloudbox.dtb \
kirkwood-d2net.dtb \
kirkwood-db-88f6281.dtb \
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
next reply other threads:[~2015-01-13 0:20 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-01-13 0:20 Stephen Rothwell [this message]
2015-01-13 1:05 ` linux-next: manual merge of the mvebu tree with the arm-soc tree Andrew Lunn
-- strict thread matches above, loose matches on Subject: below --
2022-05-09 23:41 Stephen Rothwell
2022-05-10 13:59 ` Krzysztof Kozlowski
2022-05-10 14:42 ` Arnd Bergmann
2018-05-16 22:47 Stephen Rothwell
2017-04-11 22:34 Stephen Rothwell
2017-04-12 8:23 ` Gregory CLEMENT
2017-04-12 10:51 ` Stephen Rothwell
2016-04-13 23:29 Stephen Rothwell
2016-02-17 23:33 Stephen Rothwell
2015-12-02 11:12 Mark Brown
2015-12-02 11:18 ` Mark Brown
2015-12-02 11:21 ` Arnd Bergmann
2015-12-02 13:49 ` Gregory CLEMENT
2015-12-02 15:09 ` Arnd Bergmann
2015-10-31 23:35 Stephen Rothwell
2014-05-06 1:07 Stephen Rothwell
2014-05-06 1:13 ` Olof Johansson
2014-03-18 0:21 Stephen Rothwell
2014-02-26 1:46 Stephen Rothwell
2013-08-19 6:05 Stephen Rothwell
2013-08-19 20:57 ` Jason Cooper
2013-08-19 21:09 ` Olof Johansson
2013-08-19 21:38 ` Jason Cooper
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=20150113112016.2db3f982@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=andrew@lunn.ch \
--cc=arnd@arndb.de \
--cc=evgeni@studio-punkt.com \
--cc=gregory.clement@free-electrons.com \
--cc=jason@lakedaemon.net \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=olof@lixom.net \
--cc=pbrobinson@gmail.com \
/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).