Merge branch 'x86/mm' into x86/asm, to pick up pending changes

Concentrate x86 MM and asm related changes into a single super-topic,
in preparation for larger changes.

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

diff --cc arch/x86/Kconfig
Simple merge

diff --cc arch/x86/kernel/Makefile
index 5335d05b695e910b15bf10b2a8b941c262131bee,a97a6b6115319d15faa0535c6ad115cd109ddbb2..d449c5a9db965c748a9a1ef77d1f39c9569b0c7a
--- 1/arch/x86/kernel/Makefile
--- 2/arch/x86/kernel/Makefile
+++ b/arch/x86/kernel/Makefile
@@@ -24,8 -24,10 +24,9 @@@ endi
  KASAN_SANITIZE_head$(BITS).o                          := n
  KASAN_SANITIZE_dumpstack.o                            := n
  KASAN_SANITIZE_dumpstack_$(BITS).o                    := n
- KASAN_SANITIZE_stacktrace.o := n
+ KASAN_SANITIZE_stacktrace.o                           := n
+ KASAN_SANITIZE_paravirt.o                             := n
  
 -OBJECT_FILES_NON_STANDARD_head_$(BITS).o              := y
  OBJECT_FILES_NON_STANDARD_relocate_kernel_$(BITS).o   := y
  OBJECT_FILES_NON_STANDARD_ftrace_$(BITS).o            := y
  OBJECT_FILES_NON_STANDARD_test_nx.o                   := y

diff --cc arch/x86/kernel/head_64.S
Simple merge