From mboxrd@z Thu Jan 1 00:00:00 1970 From: Arnd Bergmann Subject: Re: linux-next: manual merge of the arm-soc tree with the l2-mtd and pinctrl trees Date: Thu, 8 Nov 2012 15:11:54 +0000 Message-ID: <201211081511.54467.arnd@arndb.de> References: <20121107142916.824003a6c863320fbf379652@canb.auug.org.au> Mime-Version: 1.0 Content-Type: Text/Plain; charset="iso-8859-15" Content-Transfer-Encoding: 7bit Return-path: Received: from moutng.kundenserver.de ([212.227.126.186]:60998 "EHLO moutng.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751930Ab2KHPMG (ORCPT ); Thu, 8 Nov 2012 10:12:06 -0500 In-Reply-To: <20121107142916.824003a6c863320fbf379652@canb.auug.org.au> Sender: linux-next-owner@vger.kernel.org List-ID: To: linux-arm-kernel@lists.infradead.org Cc: Stephen Rothwell , Olof Johansson , Linus Walleij , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Artem Bityutskiy On Wednesday 07 November 2012, Stephen Rothwell wrote: > Today's linux-next merge of the arm-soc tree got a conflict in > arch/arm/mach-nomadik/board-nhk8815.c between commit 1cd2fc449091 ("ARM: > nomadik: fixup some FSMC merge problems") from the l2-mtd tree, commits > bb16bd9b9da4 ("pinctrl/nomadik: move the platform data header") from the > pinctrl and commit 44e47ccf8ab6 ("Merge branch 'next/multiplatform' into > for-next") from the arm-soc tree. > > I fixed it up (see below) and can carry the fix as necessary (no action > is required). > Hi Stephen, I think this one turned out wrong, and is missing this part: diff --git a/arch/arm/mach-nomadik/board-nhk8815.c b/arch/arm/mach-nomadik/board-nhk8815.c index 5ccdf53..69769b7 100644 --- a/arch/arm/mach-nomadik/board-nhk8815.c +++ b/arch/arm/mach-nomadik/board-nhk8815.c @@ -26,7 +26,6 @@ #include #include #include -#include #include #include #include The mtd-nomadik-nand.h inclusion was removed in the l2-mtd tree, but moved to a different line in the arm-soc tree. It needs to be removed because the header is gone now. Arnd From mboxrd@z Thu Jan 1 00:00:00 1970 From: arnd@arndb.de (Arnd Bergmann) Date: Thu, 8 Nov 2012 15:11:54 +0000 Subject: linux-next: manual merge of the arm-soc tree with the l2-mtd and pinctrl trees In-Reply-To: <20121107142916.824003a6c863320fbf379652@canb.auug.org.au> References: <20121107142916.824003a6c863320fbf379652@canb.auug.org.au> Message-ID: <201211081511.54467.arnd@arndb.de> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On Wednesday 07 November 2012, Stephen Rothwell wrote: > Today's linux-next merge of the arm-soc tree got a conflict in > arch/arm/mach-nomadik/board-nhk8815.c between commit 1cd2fc449091 ("ARM: > nomadik: fixup some FSMC merge problems") from the l2-mtd tree, commits > bb16bd9b9da4 ("pinctrl/nomadik: move the platform data header") from the > pinctrl and commit 44e47ccf8ab6 ("Merge branch 'next/multiplatform' into > for-next") from the arm-soc tree. > > I fixed it up (see below) and can carry the fix as necessary (no action > is required). > Hi Stephen, I think this one turned out wrong, and is missing this part: diff --git a/arch/arm/mach-nomadik/board-nhk8815.c b/arch/arm/mach-nomadik/board-nhk8815.c index 5ccdf53..69769b7 100644 --- a/arch/arm/mach-nomadik/board-nhk8815.c +++ b/arch/arm/mach-nomadik/board-nhk8815.c @@ -26,7 +26,6 @@ #include #include #include -#include #include #include #include The mtd-nomadik-nand.h inclusion was removed in the l2-mtd tree, but moved to a different line in the arm-soc tree. It needs to be removed because the header is gone now. Arnd