* linux-next: manual merge of the idle-test tree with the tree
@ 2011-05-30 2:25 Stephen Rothwell
2011-05-30 2:50 ` Len Brown
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2011-05-30 2:25 UTC (permalink / raw)
To: Len Brown; +Cc: linux-next, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 489 bytes --]
Hi Len,
Today's linux-next merge of the idle-test tree got a conflict in
arch/x86/include/asm/processor.h, arch/x86/kernel/cpu/common.c and
arch/x86/kernel/process.c between commits from Linus' tree and similar
commits from the idle-test tree.
I used the versions from Linus' tree as they seem to have been committed
more recently (this may not be the correct solution).
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: linux-next: manual merge of the idle-test tree with the tree
2011-05-30 2:25 linux-next: manual merge of the idle-test tree with the tree Stephen Rothwell
@ 2011-05-30 2:50 ` Len Brown
0 siblings, 0 replies; 2+ messages in thread
From: Len Brown @ 2011-05-30 2:50 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel
> Today's linux-next merge of the idle-test tree got a conflict in
> arch/x86/include/asm/processor.h, arch/x86/kernel/cpu/common.c and
> arch/x86/kernel/process.c between commits from Linus' tree and similar
> commits from the idle-test tree.
>
> I used the versions from Linus' tree as they seem to have been committed
> more recently (this may not be the correct solution).
I'll refresh the offending patch in idle-test -- upstream
changed out from under it.
thanks,
-Len
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-05-30 2:50 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-05-30 2:25 linux-next: manual merge of the idle-test tree with the tree Stephen Rothwell
2011-05-30 2:50 ` Len Brown
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox