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,
Shawn Guo <shawn.guo@linaro•org>,
Huang Shijie <b32955@freescale•com>,
Huang Shijie <shijie8@gmail•com>,
Artem Bityutskiy <artem.bityutskiy@linux•intel.com>,
Artem Bityutskiy <dedekind1@gmail•com>
Subject: linux-next: manual merge of the arm-soc tree with the l2-mtd tree
Date: Mon, 14 May 2012 18:47:46 +1000 [thread overview]
Message-ID: <20120514184746.3eef413d8e27a6b874e5cd1d@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 939 bytes --]
Hi all,
Today's linux-next merge of the arm-soc tree got a conflict in
drivers/mtd/nand/gpmi-nand/gpmi-nand.c between commit 2890c63138a4 ("mtd:
gpmi: add device tree support to gpmi-nand") from the l2-mtd tree and
commit 39febc018bd2 ("mtd: nand: gpmi: adopt pinctrl support") from the
arm-soc tree.
Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
diff --cc drivers/mtd/nand/gpmi-nand/gpmi-nand.c
index 95f2af8,8478fd9..0000000
--- a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
+++ b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
@@@ -24,8 -24,7 +24,9 @@@
#include <linux/module.h>
#include <linux/mtd/gpmi-nand.h>
#include <linux/mtd/partitions.h>
+#include <linux/of.h>
+#include <linux/of_device.h>
+ #include <linux/pinctrl/consumer.h>
#include "gpmi-nand.h"
/* add our owner bbt descriptor */
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next reply other threads:[~2012-05-14 8:47 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-14 8:47 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2013-07-02 5:33 linux-next: manual merge of the arm-soc tree with the l2-mtd tree 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-09-24 9:39 Stephen Rothwell
2012-09-24 15:50 ` Jason Cooper
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=20120514184746.3eef413d8e27a6b874e5cd1d@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=arnd@arndb$(echo .)de \
--cc=artem.bityutskiy@linux$(echo .)intel.com \
--cc=b32955@freescale$(echo .)com \
--cc=dedekind1@gmail$(echo .)com \
--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=shawn.guo@linaro$(echo .)org \
--cc=shijie8@gmail$(echo .)com \
/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