From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Ulf Hansson <ulf.hansson@linaro.org>,
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,
Tony Lindgren <tony@atomide.com>,
Andreas Fenkart <afenkart@gmail.com>
Subject: linux-next: manual merge of the mmc-uh tree with the arm-soc tree
Date: Mon, 1 Dec 2014 15:22:02 +1100 [thread overview]
Message-ID: <20141201152202.5a1b4978@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1050 bytes --]
Hi Ulf,
Today's linux-next merge of the mmc-uh tree got a conflict in
arch/arm/mach-omap2/board-n8x0.c between commit e639cd5bfc03 ("ARM:
OMAP2+: Prepare to move GPMC to drivers by platform data header") from
the arm-soc tree and commit 826c71a06588 ("ARM: OMAP2: MMC: include
mmc-omap platform header directly") from the mmc-uh 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-omap2/board-n8x0.c
index 49c3c25808e7,e0ad64fde20e..000000000000
--- a/arch/arm/mach-omap2/board-n8x0.c
+++ b/arch/arm/mach-omap2/board-n8x0.c
@@@ -21,7 -21,10 +21,9 @@@
#include <linux/i2c.h>
#include <linux/spi/spi.h>
#include <linux/usb/musb.h>
+ #include <linux/mmc/host.h>
#include <linux/platform_data/spi-omap2-mcspi.h>
-#include <linux/platform_data/mtd-onenand-omap2.h>
+ #include <linux/platform_data/mmc-omap.h>
#include <linux/mfd/menelaus.h>
#include <sound/tlv320aic3x.h>
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
next reply other threads:[~2014-12-01 4:22 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-12-01 4:22 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2014-11-10 1:56 Stephen Rothwell
2014-11-10 8:58 ` 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=20141201152202.5a1b4978@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=afenkart@gmail.com \
--cc=arnd@arndb.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=olof@lixom.net \
--cc=tony@atomide.com \
--cc=ulf.hansson@linaro.org \
/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
all inboxes | Powered by JetHome®