On 04/29/2014 07:47 AM, Matt Fleming wrote: > On Tue, 29 Apr, at 02:47:28PM, Catalin Marinas wrote: >> >> Waiting for the tip/x86/efi to be merged first is not a problem. We >> also need a stable base for testing the arm64 UEFI series, so I assume >> this series can be based onto tip/x86/efi (would such branch be rebased >> before hitting mainline?). > > tip/x86/efi is unlikely to be rebased. Certainly with dependencies like > this there would have to be a really good reason to rebase it. > >> Given that Leif's series contains both generic efi and arm64 patches, >> what's your preference for merging them? I'm happy to add my ack and >> they go via your tree (or the other way around). > > I'm happy either way, though if I take them through my tree (and > subsequently through tip) you won't have to worry about the merge window > rigmarole, which is a plus. > > So, eveyone happy for me to take these with Catalin's Acked-by? > I'm wondering if it would be better to organize it into a separate topic branch. We can still take it through tip, if you want, but it would be better than putting it all into one tree. -hpa -- To unsubscribe from this list: send the line "unsubscribe linux-efi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html