From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Rusty Russell <rusty@rustcorp.com.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@elte.hu>,
"H. Peter Anvin" <hpa@zytor.com>,
Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com>,
Yinghai Lu <yinghai@kernel.org>
Subject: Re: linux-next: manual merge of the rr tree with the tree
Date: Tue, 9 Jun 2009 19:52:00 +1000 [thread overview]
Message-ID: <20090609195200.8344c2f0.sfr@canb.auug.org.au> (raw)
In-Reply-To: <20090609135627.944b1851.sfr@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 462 bytes --]
Hi all,
On Tue, 9 Jun 2009 13:56:27 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the rr tree got a conflict in
> arch/x86/kernel/cpu/mcheck/mce{,_64}.c between commit mce_init_device
> ("x86, mce: Rename sysfs variables") from the tree and commit
^^^
x86
--
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:[~2009-06-09 9:52 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-06-09 3:56 linux-next: manual merge of the rr tree with the tree Stephen Rothwell
2009-06-09 9:52 ` Stephen Rothwell [this message]
2009-06-16 3:06 Stephen Rothwell
2011-07-05 3:59 Stephen Rothwell
2011-07-06 15:57 ` Jonas Bonn
2011-07-06 23:44 ` Greg Ungerer
2011-07-07 0:24 ` Stephen Rothwell
2011-07-07 1:07 ` Rusty Russell
2011-07-19 11:27 ` Jonathan Cameron
2011-07-21 7:55 ` Rusty Russell
2011-07-25 1:43 ` Stephen Rothwell
2011-07-25 2:09 ` Greg Ungerer
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=20090609195200.8344c2f0.sfr@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=rusty@rustcorp.com.au \
--cc=seto.hidetoshi@jp.fujitsu.com \
--cc=tglx@linutronix.de \
--cc=yinghai@kernel.org \
/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;
as well as URLs for NNTP newsgroup(s).