linux-kernel - linux-next: manual merge of the kconfig 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:	Mon, 24 Aug 2009 11:32:26 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Steven Rostedt <rostedt@...dmis.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Dick Streefland <dick@...eefland.net>,
	Sam Ravnborg <sam@...nborg.org>
Subject: linux-next: manual merge of the kconfig tree with the kbuild tree

Hi Steven,

Today's linux-next merge of the kconfig tree got conflicts in
scripts/extract-ikconfig between commit
692d21e03cfc740684639b019ce9ad708930eb47 ("kconfig: simplification of
scripts/extract-ikconfig") from the kbuild tree and commits
fd3132d5815bf72aeec7d5ad87161b4831f8e48c ("kconfig: add check if end
exists in extract-ikconfig") and 6be51ffc1791b72d11cef9bb0a578fe8c5d64c6a
("kconfig: have extract-ikconfig read ELF files") from the kconfig tree.

It looks like the kbuild patch obsoletes the first of the kconfig patches
and may obsolete the second.  I used the kbuild version for now, but
invite advice.

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped