From mboxrd@z Thu Jan 1 00:00:00 1970 From: thomas.petazzoni@free-electrons.com (Thomas Petazzoni) Date: Mon, 15 Feb 2016 10:37:12 +0100 Subject: [PATCH 0/5] arm64: Initial support for Marvell Armada 7K/8K In-Reply-To: <2808783.Lm9AZL1OAe@wuerfel> References: <1455526065-7307-1-git-send-email-thomas.petazzoni@free-electrons.com> <2808783.Lm9AZL1OAe@wuerfel> Message-ID: <20160215103712.55c09f47@free-electrons.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org Arnd, On Mon, 15 Feb 2016 10:24:29 +0100, Arnd Bergmann wrote: > 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. Best regards, Thomas -- Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com