Re: linux-next: tip-core merge conflict

Stephen Rothwell
2008-06-10T04:51:24Z

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