linux-kernel - Re: 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-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <alpine.DEB.2.00.0908241052420.7587@gandalf.stny.rr.com>
Date:	Mon, 24 Aug 2009 10:54:04 -0400 (EDT)
From:	Steven Rostedt <rostedt@...dmis.org>
To:	Dick Streefland <dick@...eefland.net>
cc:	Stephen Rothwell <sfr@...b.auug.org.au>,
	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Sam Ravnborg <sam@...nborg.org>
Subject: Re: linux-next: manual merge of the kconfig tree with the kbuild
 tree


On Mon, 24 Aug 2009, Dick Streefland wrote:

> On Monday 2009-08-24 11:32, Stephen Rothwell wrote:
> | 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.
> 
> My simplified script that you merged from the kbuild tree will also
> extract config information from ELF files. So both patches from the
> kconfig tree are not needed anymore.

OK what is the proper way to resolve this, before sending anything off to 
Linus?  Should I pull in Dick's tree and resolve the conficts myself, and 
let you repull? Or is something else recommended?

Thanks,

-- Steve

--
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/