lkml.org 
[lkml]   [2011]   [May]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: linux-next: manual merge of the idle-test tree with the tree
> 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


\
 
 \ /
  Last update: 2011-05-30 04:53    [W:0.036 / U:0.244 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site