From: Dick Streefland <dick@streefland.net>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Steven Rostedt <rostedt@goodmis.org>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Sam Ravnborg <sam@ravnborg.org>
Subject: Re: linux-next: manual merge of the kconfig tree with the kbuild tree
Date: Mon, 24 Aug 2009 10:34:33 +0200 [thread overview]
Message-ID: <20090824083433.GA6147@streefland.net> (raw)
In-Reply-To: <20090824113226.b61cccc6.sfr@canb.auug.org.au>
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.
--
Dick
next prev parent reply other threads:[~2009-08-24 9:30 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-08-24 1:32 linux-next: manual merge of the kconfig tree with the kbuild tree Stephen Rothwell
2009-08-24 8:34 ` Dick Streefland [this message]
2009-08-24 14:54 ` Steven Rostedt
2009-08-24 23:44 ` Stephen Rothwell
2009-08-25 0:33 ` Steven Rostedt
2009-08-24 16:00 ` Build failure on linux-next master branch Steven Rostedt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20090824083433.GA6147@streefland.net \
--to=dick@streefland.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=rostedt@goodmis.org \
--cc=sam@ravnborg.org \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox