Merge branch 'kbuild/kbuild' into kbuild/for-next

Conflicts:
	Makefile

diff --cc Makefile
index 638eb32d9913421461da0ddf1df14f18dfc655d2,8cc826a504ec28ff90e6ab7c22dad82b1d9fbcdd..ab2a73f1a8b09d8a2a358b36b1a1e20f9e0b0aac
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -747,7 -727,7 +743,8 @@@ ifeq ($(shell $(CONFIG_SHELL) $(srctree
        KBUILD_CFLAGS += -DCC_HAVE_ASM_GOTO
  endif
  
+ include $(srctree)/scripts/Makefile.extrawarn
 +include ${srctree}/scripts/Makefile.lto
  
  # Add user supplied CPPFLAGS, AFLAGS and CFLAGS as the last assignments
  KBUILD_CPPFLAGS += $(KCPPFLAGS)