2014-11-10 01:56:45

by Stephen Rothwell

[permalink] [raw]

Subject: linux-next: manual merge of the mmc-uh tree with the arm-soc tree

---

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 [email protected]

---

Attachments:

(No filename) (819.00 B)
OpenPGP digital signature

2014-11-10 08:59:07

by Nicolas Ferre

[permalink] [raw]

Subject: Re: linux-next: manual merge of the mmc-uh tree with the arm-soc tree

---

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