From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Thomas Gleixner <tglx@linutronix•de>, Ingo Molnar <mingo@elte•hu>,
"H. Peter Anvin" <hpa@zytor•com>
Cc: linux-next@vger•kernel.org, Sam Ravnborg <sam@ravnborg•org>
Subject: Re: linux-next: tip-core merge conflict
Date: Tue, 10 Jun 2008 14:51:16 +1000 [thread overview]
Message-ID: <20080610145116.6bc5b0ad.sfr@canb.auug.org.au> (raw)
In-Reply-To: <20080610120857.042ea0f1.sfr@canb.auug.org.au>
[-- 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 --]
next prev parent reply other threads:[~2008-06-10 4:51 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 [this message]
2008-06-10 19:04 ` Sam Ravnborg
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=20080610145116.6bc5b0ad.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=hpa@zytor$(echo .)com \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mingo@elte$(echo .)hu \
--cc=sam@ravnborg$(echo .)org \
--cc=tglx@linutronix$(echo .)de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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