Merge commit 'v4.0-rc1^0' into kbuild/for-next

diff --cc Makefile
index 6b486c01c8c7f324a959fb8aafa1807032051251,9fab639727c78e5370538afcd6980f167af6fdf6..abf7bb1556c8528cc63cc2cb677a78045f945ab3
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -792,8 -781,8 +797,9 @@@ ifeq ($(shell $(CONFIG_SHELL) $(srctree
        KBUILD_CFLAGS += -DCC_HAVE_ASM_GOTO
  endif
  
+ include $(srctree)/scripts/Makefile.kasan
  include $(srctree)/scripts/Makefile.extrawarn
 +include ${srctree}/scripts/Makefile.lto
  
  # Add user supplied CPPFLAGS, AFLAGS and CFLAGS as the last assignments
  KBUILD_CPPFLAGS += $(KCPPFLAGS)

diff --cc arch/x86/Kconfig
Simple merge

diff --cc init/Kconfig
Simple merge

diff --cc lib/Kconfig.debug
Simple merge