From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Kukjin Kim <kgene.kim@samsung.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Tomasz Figa <t.figa@samsung.com>,
Kyungmin Park <kyungmin.park@samsung.com>,
Rob Herring <rob.herring@calxeda.com>,
Olof Johansson <olof@lixom.net>, Arnd Bergmann <arnd@arndb.de>,
linux-arm-kernel@lists.infradead.org
Subject: linux-next: manual merge of the samsung tree with the arm-soc tree
Date: Mon, 24 Sep 2012 20:52:09 +1000 [thread overview]
Message-ID: <20120924205209.9b5e4eae732348f0d2b9ced8@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1389 bytes --]
Hi Kukjin,
Today's linux-next merge of the samsung tree got a conflict in
arch/arm/mach-exynos/Makefile.boot between commit 360a0cab5041 ("ARM:
move all dtb targets out of Makefile.boot") from the arm-soc tree and
commit d105f0b1215d ("ARM: dts: Add basic dts file for Samsung Trats
board") from the samsung tree.
I removed the bit from Makefile.boot and added the following merge fix
patch and can carry the fix as necessary (no action is required).
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 24 Sep 2012 20:47:44 +1000
Subject: [PATCH] ARM: fix up for movemment of dtb targets
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
arch/arm/boot/dts/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index d4ad2df..99e5e8e 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -21,7 +21,7 @@ dtb-$(CONFIG_ARCH_DOVE) += dove-cm-a510.dtb \
dove-cubox.dtb \
dove-dove-db.dtb
dtb-$(CONFIG_ARCH_EXYNOS) += exynos4210-origen.dtb \
- exynos4210-smdkv310.dtb \
+ exynos4210-smdkv310.dtb exynos4210-trats.dtb \
exynos5250-smdk5250.dtb
dtb-$(CONFIG_ARCH_HIGHBANK) += highbank.dtb
dtb-$(CONFIG_ARCH_IMX5) += imx51-babbage.dtb \
--
1.7.10.280.gaa39
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next reply other threads:[~2012-09-24 10:52 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-24 10:52 Stephen Rothwell [this message]
2012-11-26 11:15 linux-next: manual merge of the samsung tree with the arm-soc tree Stephen Rothwell
2012-11-26 11:19 Stephen Rothwell
2013-01-11 4:18 Stephen Rothwell
2013-01-11 4:32 Stephen Rothwell
2013-01-17 3:53 ` Stephen Rothwell
2013-01-17 4:06 ` Kukjin Kim
2013-01-17 4:10 ` Kukjin Kim
2013-01-17 5:02 ` Kukjin Kim
2013-01-17 5:13 ` Kukjin Kim
2013-01-17 5:59 ` Stephen Rothwell
2013-01-18 3:21 Stephen Rothwell
2013-01-18 3:24 Stephen Rothwell
2013-01-18 3:28 Stephen Rothwell
2013-01-30 14:48 Stephen Rothwell
2013-02-09 14:20 ` Grant Likely
2013-01-30 14:48 Stephen Rothwell
2013-02-13 7:39 Stephen Rothwell
2013-04-05 5:02 Stephen Rothwell
2013-04-05 6:49 ` Kukjin Kim
2014-03-23 23:30 Stephen Rothwell
2014-05-26 0:17 Stephen Rothwell
2014-05-26 0:37 ` Stephen Rothwell
2014-07-17 1:54 Stephen Rothwell
2014-07-17 2:01 Stephen Rothwell
2014-07-17 2:06 Stephen Rothwell
2014-07-21 1:13 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=20120924205209.9b5e4eae732348f0d2b9ced8@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=arnd@arndb.de \
--cc=kgene.kim@samsung.com \
--cc=kyungmin.park@samsung.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=rob.herring@calxeda.com \
--cc=t.figa@samsung.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).