Messages in this thread | ![/](/images/icornerl.gif) | | Date | Mon, 24 Aug 2009 10:54:04 -0400 (EDT) | From | Steven Rostedt <> | 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
| ![\](/images/icornerr.gif) |