From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Steven Rostedt <rostedt@goodmis•org>
Cc: Dick Streefland <dick@streefland•net>,
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: Tue, 25 Aug 2009 09:44:27 +1000 [thread overview]
Message-ID: <20090825094427.b91e3329.sfr@canb.auug.org.au> (raw)
In-Reply-To: <alpine.DEB.2.00.0908241052420.7587@gandalf.stny.rr.com>
[-- Attachment #1: Type: text/plain, Size: 1253 bytes --]
Hi Steve,
On Mon, 24 Aug 2009 10:54:04 -0400 (EDT) Steven Rostedt <rostedt@goodmis•org> wrote:
>
> On Mon, 24 Aug 2009, Dick Streefland wrote:
>
> > 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?
You could cherry-pick Dick's commit into your tree (and remove your
conflicting commits by rebasing). Or you could rebase your work on top of
Sam's kbuild tree (or merge Sam's tree) (but that would require Sam to
guarantee that his tree won't be rebased). Or you could do the rebase and
then just submit your tree to Sam for inclusion (instead of, or as well
as, it being included in linux-next directly). Or you could keep going
the way you are and resolve the conflict once one of the trees has been
merged into Linus' tree.
For the moment, I can keep resolving the conflict.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
next prev parent reply other threads:[~2009-08-24 23:44 UTC|newest]
Thread overview: 5+ 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
[not found] ` <20090824083433.GA6147@streefland.net>
2009-08-24 14:54 ` Steven Rostedt
2009-08-24 23:44 ` Stephen Rothwell [this message]
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=20090825094427.b91e3329.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=dick@streefland$(echo .)net \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=rostedt@goodmis$(echo .)org \
--cc=sam@ravnborg$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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