Re: linux-next: tip-core merge conflict

Stephen Rothwell
2008-06-10T23:52:34Z

[-- 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.