linux-next: tip-core merge conflict

linux-next: tip-core merge conflict

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 493 bytes --]

Hi all,

Today's merge of the tip-core tree got a trivial conflict in
include/asm-generic/vmlinux.lds.h between commit
f1cb2ba8ca4a8b4b76bbf0b795375af52442501b ("generic: add
OUTPUT_DATA_SECTION to vmlinux.lds.h") from the kbuild-current tree and
commit 6360b1fbb4a939efd34fc770c2ebd927c55506e0 ("move BUG_TABLE into
RODATA") from the tip-core tree.

I did the obvious fixup.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

Re: linux-next: tip-core merge conflict

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 547 bytes --]

On Tue, 10 Jun 2008 12:08:57 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's merge of the tip-core tree got a trivial conflict in
> include/asm-generic/vmlinux.lds.h between commit
> f1cb2ba8ca4a8b4b76bbf0b795375af52442501b ("generic: add
> OUTPUT_DATA_SECTION to vmlinux.lds.h") from the kbuild-current tree and
                                                  ^^^^^^^^^^^^^^
That should say "the kbuild tree".

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

Re: linux-next: tip-core merge conflict

[Sam Ravnborg]

On Tue, Jun 10, 2008 at 12:08:57PM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> Today's merge of the tip-core tree got a trivial conflict in
> include/asm-generic/vmlinux.lds.h between commit
> f1cb2ba8ca4a8b4b76bbf0b795375af52442501b ("generic: add
> OUTPUT_DATA_SECTION to vmlinux.lds.h") from the kbuild-current tree and
> commit 6360b1fbb4a939efd34fc770c2ebd927c55506e0 ("move BUG_TABLE into
> RODATA") from the tip-core tree.

I have dropped the offending commit from kbuild.git for now.
It will be applied late in the merge window.

	Sam

Re: linux-next: tip-core merge conflict

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1199 bytes --]

Hi Sam,

On Tue, 10 Jun 2008 21:04:34 +0200 Sam Ravnborg <sam@ravnborg.org> wrote:
>
> On Tue, Jun 10, 2008 at 12:08:57PM +1000, Stephen Rothwell wrote:
> > Hi all,
> > 
> > Today's merge of the tip-core tree got a trivial conflict in
> > include/asm-generic/vmlinux.lds.h between commit
> > f1cb2ba8ca4a8b4b76bbf0b795375af52442501b ("generic: add
> > OUTPUT_DATA_SECTION to vmlinux.lds.h") from the kbuild-current tree and
> > commit 6360b1fbb4a939efd34fc770c2ebd927c55506e0 ("move BUG_TABLE into
> > RODATA") from the tip-core tree.
> 
> I have dropped the offending commit from kbuild.git for now.
> It will be applied late in the merge window.

OK, thanks.  However, I am more than happy to carry these trivial merge
fixes (and Linus does these fixes all the time) so if you want to keep
this sort of thing in your tree, that's OK.  The reason I report them is
that I try to report everything.

The other thing we are considering is having a "late merge" set of trees
that I merge at the end of linux-next.  The mechanics of that are still
being thought about.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

Re: linux-next: tip-core merge conflict

[Ingo Molnar]

* Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> > I have dropped the offending commit from kbuild.git for now. It will 
> > be applied late in the merge window.
> 
> OK, thanks.  However, I am more than happy to carry these trivial 
> merge fixes (and Linus does these fixes all the time) so if you want 
> to keep this sort of thing in your tree, that's OK.  The reason I 
> report them is that I try to report everything.

i think it might be a communications issue - as conflicts are not a 
problem per se, they are just a complication that you resolve.

So it might make sense to change the subject line of your merge 
resolution mails from:

  linux-next: tip-core merge conflict

to:

  linux-next: manual merge of tip-core

that way people still stay informed about interactions between trees 
(and can reduce them when they are avoidable, and can check the result 
as well since it was done manually), but dont see it as some sort of 
failure that needs to be 'resolved' via dropping patches.

	Ingo

Re: linux-next: tip-core merge conflict

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 911 bytes --]

Hi Ingo,

On Thu, 12 Jun 2008 16:10:22 +0200 Ingo Molnar <mingo@elte.hu> wrote:
>
> i think it might be a communications issue - as conflicts are not a 
> problem per se, they are just a complication that you resolve.
> 
> So it might make sense to change the subject line of your merge 
> resolution mails from:
> 
>   linux-next: tip-core merge conflict
> 
> to:
> 
>   linux-next: manual merge of tip-core
> 
> that way people still stay informed about interactions between trees 
> (and can reduce them when they are avoidable, and can check the result 
> as well since it was done manually), but dont see it as some sort of 
> failure that needs to be 'resolved' via dropping patches.

Thanks for the suggestion, I like it.  Look forward to calmer subjects
from now on. :-)

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]