linux-next: manual merge of the arm-soc tree with the l2-mtd and pinctrl trees
Hi all, 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). -- Cheers, Stephen Rothwells...@canb.auug.org.au diff --cc arch/arm/mach-nomadik/board-nhk8815.c index ab7104f,5ccdf53..000 --- a/arch/arm/mach-nomadik/board-nhk8815.c +++ b/arch/arm/mach-nomadik/board-nhk8815.c @@@ -30,11 -31,10 +32,9 @@@ #include #include #include - #include #include #include - - #include -#include + #include #include "cpu-8815.h" pgpQX4euYf3mo.pgp Description: PGP signature
Re: linux-next: manual merge of the arm-soc tree with the l2-mtd and pinctrl trees
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 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: linux-next: manual merge of the arm-soc tree with the l2-mtd and pinctrl trees
Hi Arnd, On Thu, 8 Nov 2012 15:11:54 + Arnd Bergmann wrote: > > 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. Thanks for that. I have now fixed up my fix up :-) -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpnlfjJDR0Xj.pgp Description: PGP signature