On Thu, Jun 02, 2016 at 03:36:50PM +0100, Matt Fleming wrote: > On Wed, 01 Jun, at 11:43:26AM, Catalin Marinas wrote: > > > > Thanks for the heads up. I'll rebase the patches after -rc2 but anyway I > > plan to merge them in 4.8 via the arm64 tree, including the patch above > > if Matt acks it. So there is enough time to fix the conflicts. > > I'd really prefer it if you didn't take this series through the arm64 > tree, unless there are existing dependencies, of course. > > There were a number of conflicts in 3 different maintainer trees in > linux-next before the most recent merge window opened, and extra work > was required to sort that out. I want to avoid that in the future, so > expect me to be more insistent about keeping EFI patches in the EFI > tree than I have been in the past. > > Do arm64 prerequisites exist for this series? Or are you planning on > adding dependencies on top? I don't know when Jeremy plans to submit his contiguous PTE patches (we rejected them on the grounds of unnecessary huge page splitting, hence this series). If he's not targeting 4.8, I'm happy for the patches to go in via the EFI tree. -- Catalin -- 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
