linux-kernel - linux-next: manual merge of the tip tree with the kbuild tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Date:	Fri, 20 May 2011 13:36:31 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Thomas Gleixner <tglx@...utronix.de>, Ingo Molnar <mingo@...e.hu>,
	"H. Peter Anvin" <hpa@...or.com>,
	Peter Zijlstra <peterz@...radead.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Sam Ravnborg <sam@...nborg.org>,
	Steven Rostedt <srostedt@...hat.com>,
	Michal Marek <mmarek@...e.cz>
Subject: linux-next: manual merge of the tip tree with the kbuild tree

Hi all,

Today's linux-next merge of the tip tree got a conflict in Makefile
between commit 28bc20dccadc ("kbuild: implement several W= levels") from
the kbuild tree and commit 85356f802225 ("kbuild/recordmcount: Add
RECORDMCOUNT_WARN to warn about mcount callers") from the tip tree.

Just context changes.  I fixed it up (see below) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc Makefile
index 107f7c1,a0344a8..0000000
--- a/Makefile
+++ b/Makefile
@@@ -1287,11 -1267,8 +1287,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 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 [*] '
  	@echo  'For further info see the ./README file'
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/