Merge branch 'x86/mm' into efi/core
authorIngo Molnar <mingo@kernel.org>
Mon, 12 Mar 2018 09:03:09 +0000 (10:03 +0100)
committerIngo Molnar <mingo@kernel.org>
Mon, 12 Mar 2018 09:03:09 +0000 (10:03 +0100)
This commit in x86/mm changed EFI code:

   116fef640859: x86/mm/dump_pagetables: Add the EFI pagetable to the debugfs 'page_tables' directory

So merge in that commit plus its dependencies, before continuing with
EFI work.

Signed-off-by: Ingo Molnar <mingo@kernel.org>
1  2 
arch/x86/mm/tlb.c

Simple merge