Re: linux-next: manual merge of the kconfig tree with the kbuildtree

[Stephen Rothwell]

Hi Steve,

On Mon, 24 Aug 2009 10:54:04 -0400 (EDT) Steven Rostedt <rostedt@xxxxxxxxxxx> 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@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/

Attachment: pgp00000.pgp
Description: PGP signature