Merge branch 'x86/kdump' into locking/kcsan, to resolve conflicts

Conflicts:
	arch/x86/purgatory/Makefile

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

diff --cc MAINTAINERS
Simple merge

diff --cc Makefile
Simple merge

diff --cc arch/x86/Kconfig
Simple merge

diff --cc arch/x86/boot/Makefile
Simple merge

diff --cc arch/x86/boot/compressed/Makefile
Simple merge

diff --cc arch/x86/entry/vdso/Makefile
Simple merge

diff --cc arch/x86/kernel/Makefile
Simple merge

diff --cc arch/x86/kernel/cpu/Makefile
Simple merge

diff --cc arch/x86/mm/Makefile
Simple merge

diff --cc arch/x86/purgatory/Makefile
index 69379bc,54aadbb..b04e6e7
--- 1/arch/x86/purgatory/Makefile
--- 2/arch/x86/purgatory/Makefile
+++ b/arch/x86/purgatory/Makefile
@@@ -14,12 -14,17 +14,18 @@@ $(obj)/sha256.o: $(srctree)/lib/crypto/
  
  CFLAGS_sha256.o := -D__DISABLE_EXPORTS
  
- LDFLAGS_purgatory.ro := -e purgatory_start -r --no-undefined -nostdlib -z nodefaultlib
- targets += purgatory.ro
- 
- # Sanitizer runtimes are unavailable and cannot be linked here.
+ # When linking purgatory.ro with -r unresolved symbols are not checked,
+ # also link a purgatory.chk binary without -r to check for unresolved symbols.
+ PURGATORY_LDFLAGS := -e purgatory_start -nostdlib -z nodefaultlib
+ LDFLAGS_purgatory.ro := -r $(PURGATORY_LDFLAGS)
+ LDFLAGS_purgatory.chk := $(PURGATORY_LDFLAGS)
+ targets += purgatory.ro purgatory.chk
+ 
+ # Sanitizer, etc. runtimes are unavailable and cannot be linked here.
+ GCOV_PROFILE  := n
  KASAN_SANITIZE        := n
+ UBSAN_SANITIZE        := n
 +KCSAN_SANITIZE        := n
  KCOV_INSTRUMENT := n
  
  # These are adjustments to the compiler flags used for objects that

diff --cc arch/x86/realmode/rm/Makefile
Simple merge

diff --cc drivers/firmware/efi/libstub/Makefile
Simple merge

diff --cc include/linux/sched.h
Simple merge

diff --cc init/main.c
Simple merge

diff --cc kernel/Makefile
Simple merge

diff --cc lib/Kconfig.debug
Simple merge

diff --cc lib/Makefile
Simple merge

diff --cc mm/Makefile
Simple merge

diff --cc scripts/Makefile.lib
Simple merge