]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'modules/modules-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 2 Nov 2015 00:41:29 +0000 (11:41 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 2 Nov 2015 00:41:29 +0000 (11:41 +1100)
1  2 
lib/Kconfig.debug
scripts/Makefile.modpost

Simple merge
index 9c40daea846cdbe932328d73b789f2a634c8f8c6,1366a94b6c39565f094f2907e61a21464e0897fe..f7f758c2534c81e0cc4ae66fa385fe64abc35da4
@@@ -77,8 -77,8 +77,9 @@@ modpost = scripts/mod/modpos
   $(if $(KBUILD_EXTRA_SYMBOLS), $(patsubst %, -e %,$(KBUILD_EXTRA_SYMBOLS))) \
   $(if $(KBUILD_EXTMOD),-o $(modulesymfile))      \
   $(if $(CONFIG_DEBUG_SECTION_MISMATCH),,-S)      \
 - $(if $(KBUILD_EXTMOD)$(KBUILD_MODPOST_WARN),-w)
+  $(if $(CONFIG_SECTION_MISMATCH_WARN_ONLY),,-E)  \
 + $(if $(KBUILD_EXTMOD)$(KBUILD_MODPOST_WARN),-w) \
 + $(if $(CONFIG_LTO),-w)
  
  MODPOST_OPT=$(subst -i,-n,$(filter -i,$(MAKEFLAGS)))