On 19 September 2018 at 19:55, David Gibson <da...@gibson.dropbear.id.au> wrote: > On Wed, Sep 19, 2018 at 06:20:56PM +0100, Mark Cave-Ayland wrote: >> Here is the final set of 40p LSI SCSI routing patches with reviewer tags >> rebased upon ppc-for-3.1 as requested by David. >> >> Signed-off-by: Mark Cave-Ayland <mark.cave-ayl...@ilande.co.uk> > > So, when I requested that, I hadn't realized there were arm patches in > here. I'm not terribly comfortable taking hw/arm patches through the > ppc tree. So I'm not really sure our best way forward for merging > this.
The arm changes are only the 2-line refactorings in patch 2 that touch a couple of arm boards (as well as an hppa one and a ppc one). I think the simplest thing is for you to take the whole set through ppc; otherwise we'd have to split up patch 2, take patch 1 through some tree, the various pieces of patch 2 through multiple trees and then 3-5 through ppc once those had all landed. Since it's an obviously-correct refactoring rather than a significant change to the boards, that seems like overkill. You can have my Acked-by: Peter Maydell <peter.mayd...@linaro.org> for the arm parts. thanks -- PMM