Hi Pekka,
On Wed, 13 Aug 2008 09:19:27 +0300 Pekka Enberg <penberg@xxxxxxxxxxxxxx> wrote:
>
> Stephen Rothwell wrote:
> > Today's linux-next merge of the slab tree got a conflict in
> > lib/Kconfig.debug between commit 3794f3e812ef707a4f7931742274d1d0ca6597b4
> > ("docsrc: build Documentation/ sources") from Linus' tree and commit
> > 5db80305ad7ea891246aec24204630c2925e7b12 ("kmemtrace: Core
> > implementation") from the slab tree.
> >
> > Just a matter of overlapping additions. I took both sets.
>
> Can I fix this up in my tree? Mine is based on Linus so should I rebase
> my 'for-next' branch on top of linux-next?
You should *never* base anything on linux-next if it is to be included in
linux-next. What you should do is merge in Linus' latest tree (since
that is the other side of the conflict, in this case) and you will get the
same conflict and you can fix it in the merge that you do. Then tomorrow,
I won't see the conflict when I do my merge of your updated tree.
This is not urgent, though, as "git rerere" will redo the fixup for me
tomorrow if you haven't fixed it.
If I get conflicts between your tree and other trees in linus-next, there
is generally nothing you can do about it and I will just have to fix the
conflict each day. This is as it should be. :-)
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
Attachment:
pgpwQEvAph70y.pgp
Description: PGP signature
