* linux-next: manual merge of the mmc-uh tree with the arm-soc tree
@ 2014-11-10 1:56 Stephen Rothwell
2014-11-10 8:58 ` Nicolas Ferre
0 siblings, 1 reply; 3+ messages in thread
From: Stephen Rothwell @ 2014-11-10 1:56 UTC (permalink / raw)
To: Ulf Hansson, Olof Johansson, Arnd Bergmann, linux-arm-kernel
Cc: linux-next, linux-kernel, Alexandre Belloni, Nicolas Ferre
[-- Attachment #1: Type: text/plain, Size: 492 bytes --]
Hi Ulf,
Today's linux-next merge of the mmc-uh tree got a conflict in
arch/arm/mach-at91/at91sam9g45_devices.c between commit 4bf7753b8ab7
("ARM: at91: remove at91sam9g45/9m10 legacy board support") from the
arm-soc tree and commit 4049854c41e0 ("ARM: at91: remove
mach/atmel-mci.h") from the mmc-uh tree.
I fixed it up (I just removed the file) and can carry the fix as
necessary (no action is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: linux-next: manual merge of the mmc-uh tree with the arm-soc tree
2014-11-10 1:56 linux-next: manual merge of the mmc-uh tree with the arm-soc tree Stephen Rothwell
@ 2014-11-10 8:58 ` Nicolas Ferre
0 siblings, 0 replies; 3+ messages in thread
From: Nicolas Ferre @ 2014-11-10 8:58 UTC (permalink / raw)
To: Stephen Rothwell, Ulf Hansson, Olof Johansson, Arnd Bergmann,
linux-arm-kernel
Cc: linux-next, linux-kernel, Alexandre Belloni
On 10/11/2014 02:56, Stephen Rothwell :
> Hi Ulf,
>
> Today's linux-next merge of the mmc-uh tree got a conflict in
> arch/arm/mach-at91/at91sam9g45_devices.c between commit 4bf7753b8ab7
> ("ARM: at91: remove at91sam9g45/9m10 legacy board support") from the
> arm-soc tree and commit 4049854c41e0 ("ARM: at91: remove
> mach/atmel-mci.h") from the mmc-uh tree.
>
> I fixed it up (I just removed the file) and can carry the fix as
> necessary (no action is required).
Well fixed. Thanks Stephen.
Bye,
--
Nicolas Ferre
^ permalink raw reply [flat|nested] 3+ messages in thread
* linux-next: manual merge of the mmc-uh tree with the arm-soc tree
@ 2014-12-01 4:22 Stephen Rothwell
0 siblings, 0 replies; 3+ messages in thread
From: Stephen Rothwell @ 2014-12-01 4:22 UTC (permalink / raw)
To: Ulf Hansson, Olof Johansson, Arnd Bergmann, linux-arm-kernel
Cc: linux-next, linux-kernel, Tony Lindgren, Andreas Fenkart
[-- 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 --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-12-01 4:22 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-11-10 1:56 linux-next: manual merge of the mmc-uh tree with the arm-soc tree Stephen Rothwell
2014-11-10 8:58 ` Nicolas Ferre
2014-12-01 4:22 Stephen Rothwell
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).