Merge tag 'v4.3-rc1' into kbuild/for-next

Linux 4.3-rc1

diff --cc Makefile
index 95737693b8b62f6c455c274babc2f6f523652fac,1a132ea43ca52588909bb054624177c8f8f63095..3f645d285cc95aedab74105ff8d9bc522974ed50
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -788,12 -777,12 +793,13 @@@ endi
  
  include scripts/Makefile.kasan
  include scripts/Makefile.extrawarn
 +include scripts/Makefile.lto
  
- # Add user supplied CPPFLAGS, AFLAGS and CFLAGS as the last assignments
- KBUILD_CPPFLAGS += $(KCPPFLAGS)
- KBUILD_AFLAGS += $(KAFLAGS)
- KBUILD_CFLAGS += $(KCFLAGS)
+ # Add any arch overrides and user supplied CPPFLAGS, AFLAGS and CFLAGS as the
+ # last assignments
+ KBUILD_CPPFLAGS += $(ARCH_CPPFLAGS) $(KCPPFLAGS)
+ KBUILD_AFLAGS   += $(ARCH_AFLAGS)   $(KAFLAGS)
+ KBUILD_CFLAGS   += $(ARCH_CFLAGS)   $(KCFLAGS)
  
  # Use --build-id when available.
  LDFLAGS_BUILD_ID = $(patsubst -Wl$(comma)%,%,\

diff --cc arch/x86/Kconfig
Simple merge

diff --cc init/Kconfig
Simple merge

diff --cc lib/Kconfig.debug
Simple merge