Merge tag 'v5.7-rc1' into locking/kcsan, to resolve conflicts and refresh

Resolve these conflicts:

	arch/x86/Kconfig
	arch/x86/kernel/Makefile

Do a minor "evil merge" to move the KCSAN entry up a bit by a few lines
in the Kconfig to reduce the probability of future conflicts.

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

diff --cc MAINTAINERS
index b99c815,e64e5db..e9e94ea
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -9050,24 -9174,13 +9174,24 @@@ F:   scripts/Makefile.kasa
  
  KCONFIG
  M:    Masahiro Yamada <masahiroy@kernel.org>
- T:    git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git kconfig
  L:    linux-kbuild@vger.kernel.org
  S:    Maintained
+ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git kconfig
  F:    Documentation/kbuild/kconfig*
- F:    scripts/kconfig/
  F:    scripts/Kconfig.include
+ F:    scripts/kconfig/
  
 +KCSAN
 +M:    Marco Elver <elver@google.com>
 +R:    Dmitry Vyukov <dvyukov@google.com>
 +L:    kasan-dev@googlegroups.com
 +S:    Maintained
 +F:    Documentation/dev-tools/kcsan.rst
 +F:    include/linux/kcsan*.h
 +F:    kernel/kcsan/
 +F:    lib/Kconfig.kcsan
 +F:    scripts/Makefile.kcsan
 +
  KDUMP
  M:    Dave Young <dyoung@redhat.com>
  M:    Baoquan He <bhe@redhat.com>

diff --cc Makefile
Simple merge

diff --cc arch/x86/Kconfig
index 7db3438,1d6104e..54276dd
--- 1/arch/x86/Kconfig
--- 2/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@@ -228,9 -229,9 +229,10 @@@ config X8
        select THREAD_INFO_IN_TASK
        select USER_STACKTRACE_SUPPORT
        select VIRT_TO_BUS
++      select HAVE_ARCH_KCSAN                  if X86_64
        select X86_FEATURE_NAMES                if PROC_FS
        select PROC_PID_ARCH_STATUS             if PROC_FS
-       select HAVE_ARCH_KCSAN                  if X86_64
+       imply IMA_SECURE_AND_OR_TRUSTED_BOOT    if EFI
  
  config INSTRUCTION_DECODER
        def_bool y

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

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

diff --cc arch/x86/include/asm/bitops.h
Simple merge

diff --cc arch/x86/kernel/Makefile
index 7061559,ba89cab..d6d61c4
--- 1/arch/x86/kernel/Makefile
--- 2/arch/x86/kernel/Makefile
+++ b/arch/x86/kernel/Makefile
@@@ -28,11 -28,6 +28,10 @@@ KASAN_SANITIZE_dumpstack_$(BITS).o                  :
  KASAN_SANITIZE_stacktrace.o                           := n
  KASAN_SANITIZE_paravirt.o                             := n
  
- OBJECT_FILES_NON_STANDARD_relocate_kernel_$(BITS).o   := y
 +# With some compiler versions the generated code results in boot hangs, caused
 +# by several compilation units. To be safe, disable all instrumentation.
 +KCSAN_SANITIZE := n
 +
  OBJECT_FILES_NON_STANDARD_test_nx.o                   := y
  OBJECT_FILES_NON_STANDARD_paravirt_patch.o            := y
  

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

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

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

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

diff --cc init/init_task.c
Simple merge

diff --cc init/main.c
Simple merge

diff --cc lib/Kconfig.debug
Simple merge

diff --cc lib/Makefile
Simple merge

diff --cc mm/Makefile
index c9696f3,fccd375..7881b8e
--- 1/mm/Makefile
--- 2/mm/Makefile
+++ b/mm/Makefile
@@@ -6,15 -6,8 +6,16 @@@
  KASAN_SANITIZE_slab_common.o := n
  KASAN_SANITIZE_slab.o := n
  KASAN_SANITIZE_slub.o := n
+ KCSAN_SANITIZE_kmemleak.o := n
  
 +# These produce frequent data race reports: most of them are due to races on
 +# the same word but accesses to different bits of that word. Re-enable KCSAN
 +# for these when we have more consensus on what to do about them.
 +KCSAN_SANITIZE_slab_common.o := n
 +KCSAN_SANITIZE_slab.o := n
 +KCSAN_SANITIZE_slub.o := n
 +KCSAN_SANITIZE_page_alloc.o := n
 +
  # These files are disabled because they produce non-interesting and/or
  # flaky coverage that is not a function of syscall inputs. E.g. slab is out of
  # free pages, or a task is migrated between nodes.

diff --cc scripts/Makefile.lib
Simple merge

diff --cc tools/objtool/check.c
Simple merge