From: Arnd Bergmann <arnd@arndb•de>
To: linux-arm-kernel@lists•infradead.org
Cc: Stephen Rothwell <sfr@canb•auug.org.au>,
Olof Johansson <olof@lixom•net>,
Linus Walleij <linus.walleij@linaro•org>,
linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Artem Bityutskiy <dedekind1@gmail•com>
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 [thread overview]
Message-ID: <201211081511.54467.arnd@arndb.de> (raw)
In-Reply-To: <20121107142916.824003a6c863320fbf379652@canb.auug.org.au>
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
next prev parent reply other threads:[~2012-11-08 15:12 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
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 [this message]
2012-11-08 20:27 ` Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=201211081511.54467.arnd@arndb.de \
--to=arnd@arndb$(echo .)de \
--cc=dedekind1@gmail$(echo .)com \
--cc=linus.walleij@linaro$(echo .)org \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=olof@lixom$(echo .)net \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox