From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Olof Johansson <olof@lixom.net>, Arnd Bergmann <arnd@arndb.de>,
linux-arm-kernel@lists.infradead.org
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Thomas Petazzoni <thomas.petazzoni@free-electrons.com>,
Artem Bityutskiy <dedekind1@gmail.com>
Subject: linux-next: manual merge of the arm-soc tree with the l2-mtd tree
Date: Mon, 24 Sep 2012 19:39:34 +1000 [thread overview]
Message-ID: <20120924193934.76d4feafb689b265ff49c5c3@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 928 bytes --]
Hi all,
Today's linux-next merge of the arm-soc tree got a conflict in
drivers/mtd/nand/orion_nand.c between commit 11a3910e730e ("mtd:
orion_nand: remove <mach/hardware.h> include") from the l2-mtd tree and
commit c02cecb92ed4 ("ARM: orion: move platform_data definitions") 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 drivers/mtd/nand/orion_nand.c
index 9ee436d,131b58a..0000000
--- a/drivers/mtd/nand/orion_nand.c
+++ b/drivers/mtd/nand/orion_nand.c
@@@ -21,7 -21,8 +21,7 @@@
#include <linux/err.h>
#include <asm/io.h>
#include <asm/sizes.h>
- #include <plat/orion_nand.h>
-#include <mach/hardware.h>
+ #include <linux/platform_data/mtd-orion_nand.h>
static void orion_nand_cmd_ctrl(struct mtd_info *mtd, int cmd, unsigned int ctrl)
{
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next reply other threads:[~2012-09-24 9:39 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-24 9:39 Stephen Rothwell [this message]
2012-09-24 15:50 ` linux-next: manual merge of the arm-soc tree with the l2-mtd tree Jason Cooper
-- strict thread matches above, loose matches on Subject: below --
2013-07-02 5:33 Stephen Rothwell
2013-07-02 5:29 Stephen Rothwell
2013-07-02 5:44 ` Gupta, Pekon
2013-07-02 6:00 ` Olof Johansson
2013-07-02 6:18 ` Gupta, Pekon
2013-07-02 7:33 ` Artem Bityutskiy
2013-07-02 7:30 ` Artem Bityutskiy
2012-11-27 4:37 Stephen Rothwell
2012-11-26 10:16 Stephen Rothwell
2012-09-25 6:50 Stephen Rothwell
2012-05-14 8:47 Stephen Rothwell
2012-03-19 6:47 Stephen Rothwell
2012-03-19 9:00 ` Nicolas Ferre
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=20120924193934.76d4feafb689b265ff49c5c3@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=arnd@arndb.de \
--cc=dedekind1@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=olof@lixom.net \
--cc=thomas.petazzoni@free-electrons.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).