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/platform/efi/efi_64.c

@@ -229,7 +229,7 @@ int __init efi_alloc_page_tables(void)
 	if (!pud) {
 		if (pgtable_l5_enabled)
 			free_page((unsigned long) pgd_page_vaddr(*pgd));
-		free_page((unsigned long)efi_pgd);
+		free_pages((unsigned long)efi_pgd, PGD_ALLOCATION_ORDER);
 		return -ENOMEM;
 	}