From: Rusty Russell <rusty@rustcorp.com.au>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, Bryan Wu <cooloney.lkml@gmail.com>,
Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@elte.hu>,
"H. Peter Anvin" <hpa@zytor.com>
Subject: Re: linux-next: manual merge of the rr tree with the blackfin and x86 trees
Date: Sat, 7 Mar 2009 11:41:53 +1030 [thread overview]
Message-ID: <200903071141.54753.rusty@rustcorp.com.au> (raw)
In-Reply-To: <20090306153759.c8c6b470.sfr@canb.auug.org.au>
On Friday 06 March 2009 15:07:59 Stephen Rothwell wrote:
> Hi Rusty,
>
> Today's linux-next merge of the rr tree added conflicts in
> arch/blackfin/kernel/ipipe.c and arch/x86/mach-voyager/setup.c. I didn't
> bother to work out exactly what is conflicting because I dropped the rr
> tree due to the build failures that I assume are still present from
> yesterday.
Good call. Arabella didn't quite sleep long enough for me to get the fixes
out yesterday.
I've moved the arch/blackfin/kernel/ipipe.c patch out of linux-next until I've
sorted this.
Thanks,
Rusty.
prev parent reply other threads:[~2009-03-07 1:12 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-03-06 4:37 linux-next: manual merge of the rr tree with the blackfin and x86 trees Stephen Rothwell
2009-03-07 1:11 ` Rusty Russell [this message]
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=200903071141.54753.rusty@rustcorp.com.au \
--to=rusty@rustcorp.com.au \
--cc=cooloney.lkml@gmail.com \
--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;
as well as URLs for NNTP newsgroup(s).