Merge tag 'v4.16-rc7' into x86/mm, to fix up conflict
authorIngo Molnar <mingo@kernel.org>
Tue, 27 Mar 2018 06:43:39 +0000 (08:43 +0200)
committerIngo Molnar <mingo@kernel.org>
Tue, 27 Mar 2018 06:43:39 +0000 (08:43 +0200)
commit0bc91d4ba77156ae9217d25ed7c434540f950d05
tree949c1acf27b106184d8842586740fbbcc9c9ea62
parent565977a3d929fc4427769117a8ac976ec16776d5
parent3eb2ce825ea1ad89d20f7a3b5780df850e4be274
Merge tag 'v4.16-rc7' into x86/mm, to fix up conflict

 Conflicts:
arch/x86/mm/init_64.c

Signed-off-by: Ingo Molnar <mingo@kernel.org>
arch/x86/boot/compressed/misc.c
arch/x86/entry/entry_64.S
arch/x86/kernel/cpu/intel.c
arch/x86/mm/init_64.c
arch/x86/platform/efi/efi_64.c