On Fri, 29 Apr 2016, Ingo Molnar wrote: > Also, it would be nice to have all things EFI in a single tree, the conflicts are > going to be painful! There's very little reason not to carry this kind of commit: > > arch/arm/xen/enlighten.c | 6 +++++ > drivers/firmware/efi/arm-runtime.c | 17 +++++++++----- > drivers/firmware/efi/efi.c | 45 ++++++++++++++++++++++++++++++++------ > 3 files changed, 56 insertions(+), 12 deletions(-) > > in the EFI tree. That's true. I'll drop this commit from xentip and let Matt pick it up or request changes as he sees fit. -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html