Merge branch 'linus' into x86/dma, to resolve a conflict with upstream

Conflicts:
	arch/x86/mm/init_64.c

Signed-off-by: Ingo Molnar <mingo@kernel.org>

diff --cc arch/x86/mm/init_64.c
index 9bbc51ae54a682495b84c54ba47e6a4690f0b599,af11a2890235584a5f07cfe7f83a00ea71fc47f9..45241de66785ea683d334951c95f04951562b533
--- 1/arch/x86/mm/init_64.c
--- 2/arch/x86/mm/init_64.c
+++ b/arch/x86/mm/init_64.c
@@@ -1099,8 -1089,8 +1095,8 @@@ remove_p4d_table(p4d_t *p4d_start, unsi
                 * 5-level case we should free them. This code will have to change
                 * to adapt for boot-time switching between 4 and 5 level page tables.
                 */
 -              if (CONFIG_PGTABLE_LEVELS == 5)
 +              if (pgtable_l5_enabled)
-                       free_pud_table(pud_base, p4d, altmap);
+                       free_pud_table(pud_base, p4d);
        }
  
        if (direct)