From patchwork Mon Sep 24 10:52:09 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 1497261 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork2.kernel.org (Postfix) with ESMTP id 789A6DF280 for ; Mon, 24 Sep 2012 10:54:21 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TG6H9-00084F-Fq; Mon, 24 Sep 2012 10:52:31 +0000 Received: from haggis.tip.net.au ([2402:b800:7003:1::20] helo=members.tip.net.au) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TG6H3-000839-Tu for linux-arm-kernel@lists.infradead.org; Mon, 24 Sep 2012 10:52:28 +0000 Received: from canb.auug.org.au (ash.rothwell.emu.id.au [IPv6:2402:b800:7003:7010:223:14ff:fe30:c8e4]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by members.tip.net.au (Postfix) with ESMTPSA id 4F7A21640C7; Mon, 24 Sep 2012 20:52:17 +1000 (EST) Date: Mon, 24 Sep 2012 20:52:09 +1000 From: Stephen Rothwell To: Kukjin Kim Subject: linux-next: manual merge of the samsung tree with the arm-soc tree Message-Id: <20120924205209.9b5e4eae732348f0d2b9ced8@canb.auug.org.au> X-Mailer: Sylpheed 3.2.0 (GTK+ 2.24.10; i486-pc-linux-gnu) Mime-Version: 1.0 X-Spam-Note: CRM114 invocation failed X-Spam-Score: -1.9 (-) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-1.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Arnd Bergmann , Tomasz Figa , linux-kernel@vger.kernel.org, Rob Herring , Kyungmin Park , linux-next@vger.kernel.org, Olof Johansson , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org 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 Date: Mon, 24 Sep 2012 20:47:44 +1000 Subject: [PATCH] ARM: fix up for movemment of dtb targets Signed-off-by: Stephen Rothwell --- 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 \