From: Sam Ravnborg <sam@ravnborg.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@elte.hu>,
"H. Peter Anvin" <hpa@zytor.com>,
linux-next@vger.kernel.org
Subject: Re: linux-next: tip-core merge conflict
Date: Tue, 10 Jun 2008 21:04:34 +0200 [thread overview]
Message-ID: <20080610190434.GC15983@uranus.ravnborg.org> (raw)
In-Reply-To: <20080610120857.042ea0f1.sfr@canb.auug.org.au>
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
next prev parent reply other threads:[~2008-06-10 19:03 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-06-10 2:08 linux-next: tip-core merge conflict Stephen Rothwell
2008-06-10 4:51 ` Stephen Rothwell
2008-06-10 19:04 ` Sam Ravnborg [this message]
2008-06-10 23:52 ` Stephen Rothwell
2008-06-12 14:10 ` Ingo Molnar
2008-06-12 14:34 ` Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20080610190434.GC15983@uranus.ravnborg.org \
--to=sam@ravnborg.org \
--cc=hpa@zytor.com \
--cc=linux-next@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=sfr@canb.auug.org.au \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox