* linux-next: manual merge of the arm-soc tree with the l2-mtd and pinctrl trees
@ 2012-11-07 3:29 Stephen Rothwell
2012-11-08 15:11 ` Arnd Bergmann
0 siblings, 1 reply; 3+ messages in thread
From: Stephen Rothwell @ 2012-11-07 3:29 UTC (permalink / raw)
To: Olof Johansson, Arnd Bergmann, linux-arm-kernel
Cc: linux-next, linux-kernel, Linus Walleij, Artem Bityutskiy
[-- Attachment #1: Type: text/plain, Size: 1062 bytes --]
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 Rothwell sfr@canb•auug.org.au
diff --cc arch/arm/mach-nomadik/board-nhk8815.c
index ab7104f,5ccdf53..0000000
--- a/arch/arm/mach-nomadik/board-nhk8815.c
+++ b/arch/arm/mach-nomadik/board-nhk8815.c
@@@ -30,11 -31,10 +32,9 @@@
#include <asm/sizes.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
- #include <asm/mach/irq.h>
#include <asm/mach/flash.h>
#include <asm/mach/time.h>
-
- #include <plat/mtu.h>
-#include <mach/fsmc.h>
+ #include <mach/irqs.h>
#include "cpu-8815.h"
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: linux-next: manual merge of the arm-soc tree with the l2-mtd and pinctrl trees
2012-11-07 3:29 linux-next: manual merge of the arm-soc tree with the l2-mtd and pinctrl trees Stephen Rothwell
@ 2012-11-08 15:11 ` Arnd Bergmann
2012-11-08 20:27 ` Stephen Rothwell
0 siblings, 1 reply; 3+ messages in thread
From: Arnd Bergmann @ 2012-11-08 15:11 UTC (permalink / raw)
To: linux-arm-kernel
Cc: Stephen Rothwell, Olof Johansson, Linus Walleij, linux-next,
linux-kernel, 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 <linux/pinctrl/machine.h>
#include <linux/platform_data/pinctrl-nomadik.h>
#include <linux/platform_data/clocksource-nomadik-mtu.h>
-#include <linux/platform_data/mtd-nomadik-nand.h>
#include <asm/hardware/vic.h>
#include <asm/sizes.h>
#include <asm/mach-types.h>
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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: linux-next: manual merge of the arm-soc tree with the l2-mtd and pinctrl trees
2012-11-08 15:11 ` Arnd Bergmann
@ 2012-11-08 20:27 ` Stephen Rothwell
0 siblings, 0 replies; 3+ messages in thread
From: Stephen Rothwell @ 2012-11-08 20:27 UTC (permalink / raw)
To: Arnd Bergmann
Cc: linux-arm-kernel, Olof Johansson, Linus Walleij, linux-next,
linux-kernel, Artem Bityutskiy
[-- Attachment #1: Type: text/plain, Size: 1014 bytes --]
Hi Arnd,
On Thu, 8 Nov 2012 15:11:54 +0000 Arnd Bergmann <arnd@arndb•de> 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 <linux/pinctrl/machine.h>
> #include <linux/platform_data/pinctrl-nomadik.h>
> #include <linux/platform_data/clocksource-nomadik-mtu.h>
> -#include <linux/platform_data/mtd-nomadik-nand.h>
> #include <asm/hardware/vic.h>
> #include <asm/sizes.h>
> #include <asm/mach-types.h>
>
>
> 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 Rothwell sfr@canb•auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-11-08 20:27 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-11-07 3:29 linux-next: manual merge of the arm-soc tree with the l2-mtd and pinctrl trees Stephen Rothwell
2012-11-08 15:11 ` Arnd Bergmann
2012-11-08 20:27 ` Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox