* Ingo Molnar <mingo@xxxxxxxxxx> wrote: > > -static pgd_t *efi_pgd; > > - > > Hm, so there's some interaction here with: > > 116fef640859: x86/mm/dump_pagetables: Add the EFI pagetable to the debugfs 'page_tables' directory > > which is in tip:x86/mm. > > Could you please resolve that conflict? I'll sort out the topic branches > afterwards. So I've resolved it the following way, I merged the conflicting commit into tip:efi/core and applied the 3 unrelated patches from your series: 36b649760e94: efi: Use string literals for efi_char16_t variable initializers 136d5d57e35c: efi/esrt: Fix handling of early ESRT table mapping 7e904a91bf60: efi: Use efi_mm in x86 as well as ARM b0599e2801df: Merge branch 'x86/mm' into efi/core and pushed it out. So if you could resolve the two conflicting patches on top of 36b649760e94 then we should be good going forward. Thanks, Ingo -- 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
