From patchwork Tue Feb 25 06:09:44 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 3712791 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id BE8269F2F7 for ; Tue, 25 Feb 2014 06:11:09 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D06A02017E for ; Tue, 25 Feb 2014 06:11:08 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id B44712016C for ; Tue, 25 Feb 2014 06:11:07 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WIBDv-00075E-8h; Tue, 25 Feb 2014 06:10:35 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WIBDo-00057U-EX; Tue, 25 Feb 2014 06:10:28 +0000 Received: from ozlabs.org ([2402:b800:7003:1:1::1]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WIBDZ-00053V-Tt for linux-arm-kernel@lists.infradead.org; Tue, 25 Feb 2014 06:10:15 +0000 Received: from canb.auug.org.au (ibmaus65.lnk.telstra.net [165.228.126.9]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPSA id 06E582C00CD; Tue, 25 Feb 2014 17:09:51 +1100 (EST) Date: Tue, 25 Feb 2014 17:09:44 +1100 From: Stephen Rothwell To: Greg KH , Olof Johansson , Arnd Bergmann , Subject: linux-next: manual merge of the staging tree with the arm-soc tree Message-Id: <20140225170944.d322d9868871bc2f669b92e5@canb.auug.org.au> X-Mailer: Sylpheed 3.4.0beta7 (GTK+ 2.24.22; i486-pc-linux-gnu) Mime-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140225_011014_646253_1AE4A047 X-CRM114-Status: GOOD ( 26.40 ) X-Spam-Score: -1.9 (-) Cc: Russell King , linux-next@vger.kernel.org, Steffen Trumtrar , linux-kernel@vger.kernel.org, Shawn Guo X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Hi Greg, Today's linux-next merge of the staging tree got a conflict in arch/arm/boot/dts/imx53-qsb.dts between commit d5eb195f26fa ("ARM: dts: i.MX53: move common QSB nodes to new file") from the arm-soc tree and commit 17b5001b5143 ("imx-drm: convert to componentised device support") from the staging tree. I fixed it up (see at bottom) and can carry the fix as necessary (no action is required). I also added the following fix up patch: From: Stephen Rothwell Date: Tue, 25 Feb 2014 17:07:01 +1100 Subject: [PATCH] ARM: dts: i.MX53: merge fix patch Signed-off-by: Stephen Rothwell --- arch/arm/boot/dts/imx53-qsb-common.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/imx53-qsb-common.dtsi b/arch/arm/boot/dts/imx53-qsb-common.dtsi index 2dca98b79f48..5dd37c7c38b8 100644 --- a/arch/arm/boot/dts/imx53-qsb-common.dtsi +++ b/arch/arm/boot/dts/imx53-qsb-common.dtsi @@ -17,7 +17,7 @@ reg = <0x70000000 0x40000000>; }; - display@di0 { + display0: display@di0 { compatible = "fsl,imx-parallel-display"; crtcs = <&ipu 0>; interface-pix-fmt = "rgb565";