Merge branches 'kbuild/kbuild' and 'kbuild/misc' into kbuild/for-next

Conflicts:
	scripts/Makefile.host (trivial context conflict)

diff --cc Makefile
index abc3bc2c6082af69e227380685da7a0ff5477688,20c3379ac1ec973947beb1ad00ab1bbcc8279979,60ccbfe750a2641db2e43635885985b9e49318ed..11a668823a079830371609b2339abc60f5c5c9de
--- 1/Makefile
--- 2/Makefile
--- 3/Makefile
+++ b/Makefile
@@@@ -352,16 -352,11 -346,12 +352,16 @@@@ $(srctree)/scripts/Kbuild.include: 
   include $(srctree)/scripts/Kbuild.include
   
   # Make variables (CC, etc...)
  -
   AS           = $(CROSS_COMPILE)as
   LD           = $(CROSS_COMPILE)ld
 ++LDFINAL      = $(LD)
   CC           = $(CROSS_COMPILE)gcc
   CPP          = $(CC) -E
 ++ifdef CONFIG_LTO
 ++AR           = $(CROSS_COMPILE)gcc-ar
 ++else
   AR           = $(CROSS_COMPILE)ar
 ++endif
   NM           = $(CROSS_COMPILE)nm
   STRIP                = $(CROSS_COMPILE)strip
   OBJCOPY              = $(CROSS_COMPILE)objcopy
@@@@ -760,9 -744,8 -731,6 +760,9 @@@@ 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)
   KBUILD_AFLAGS += $(KAFLAGS)

diff --cc scripts/Makefile.host
index 0f0d6ba87e42f531aae18843d5b304aba2b2355e,0f0d6ba87e42f531aae18843d5b304aba2b2355e,b0ec4be6767424bfd53f6e0642e3e4c7b0cff043..66893643fd7d14a6f59bb52a17b0393180e7051d
--- 1/scripts/Makefile.host
--- 2/scripts/Makefile.host
--- 3/scripts/Makefile.host
+++ b/scripts/Makefile.host
@@@@ -166,5 -166,5 -166,4 +166,4 @@@@ $(host-cshlib): $(obj)/%: $(host-cshobj
        $(call if_changed,host-cshlib)
   
   targets += $(host-csingle)  $(host-cmulti) $(host-cobjs)\
  -        $(host-cxxmulti) $(host-cxxobjs) $(host-cshlib) $(host-cshobjs) 
  +        $(host-cxxmulti) $(host-cxxobjs) $(host-cshlib) $(host-cshobjs)
-- 

diff --cc scripts/kconfig/Makefile
Simple merge