* linux-next: manual merge of the rr tree with the blackfin and x86 trees
@ 2009-03-06 4:37 Stephen Rothwell
2009-03-07 1:11 ` Rusty Russell
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2009-03-06 4:37 UTC (permalink / raw)
To: Rusty Russell
Cc: linux-next, Bryan Wu, Thomas Gleixner, Ingo Molnar,
H. Peter Anvin
[-- Attachment #1: Type: text/plain, Size: 411 bytes --]
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.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: linux-next: manual merge of the rr tree with the blackfin and x86 trees
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
0 siblings, 0 replies; 2+ messages in thread
From: Rusty Russell @ 2009-03-07 1:11 UTC (permalink / raw)
To: Stephen Rothwell
Cc: linux-next, Bryan Wu, Thomas Gleixner, Ingo Molnar,
H. Peter Anvin
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.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2009-03-07 1:12 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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 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).