Merge branch 'tip/perf/core-2' of git://git.kernel.org/pub/scm/linux/kernel/git/roste...

Conflicts:
	Makefile

diff --cc Makefile
index badb9239e2bb4ab64a8d016bfebe80319aa08d08,e7d01adaf6929c2859572b0cc0205123da436cff..cb6bdab8947b4495226cd897a91334b4bea248ba
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -1290,11 -1267,7 +1290,12 @@@ help
        @echo  '  make O=dir [targets] Locate all output files in "dir", including .config'
        @echo  '  make C=1   [targets] Check all c source with $$CHECK (sparse by default)'
        @echo  '  make C=2   [targets] Force check of all c source with $$CHECK'
 -      @echo  '  make W=1   [targets] Enable extra gcc checks'
++      @echo  '  make RECORDMCOUNT_WARN=1 [targets] Warn about ignored mcount sections'
 +      @echo  '  make W=n   [targets] Enable extra gcc checks, n=1,2,3 where'
 +      @echo  '                1: warnings which may be relevant and do not occur too often'
 +      @echo  '                2: warnings which occur quite often but may still be relevant'
 +      @echo  '                3: more obscure warnings, can most likely be ignored'
 +      @echo  '                Multiple levels can be combined with W=12 or W=123'
        @echo  '  make RECORDMCOUNT_WARN=1 [targets] Warn about ignored mcount sections'
        @echo  ''
        @echo  'Execute "make" or "make all" to build all targets marked with [*] '