[PATCH 0/5] arm64: Initial support for Marvell Armada 7K/8K

On Monday 15 February 2016 10:37:12 Thomas Petazzoni wrote:

Arnd,

On Mon, 15 Feb 2016 10:24:29 +0100, Arnd Bergmann wrote:

quoted

The new code looks ok, but I think I need to resubmit my cleanup of the
Documentation/arm/Marvell/README fiel that I submitted a while ago,
which now conflicts with the changes you did in patch 3.

If you don't mind, can you add my patch to your series to resolve
the conflict? I'll resend in a minute.

Before my series, Gregory's series is already doing some changes to the
Marvell README file, though it is possible that they don't conflict
with your changes. Anyway, we'll take care of merging your file, I'll
sync with Gregory on this.

Ok, thanks!

	Arnd