[lkml]   [2011]   [May]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
Subjectlinux-next: manual merge of the idle-test tree with the tree
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).
Stephen Rothwell
[unhandled content-type:application/pgp-signature]
 \ /
  Last update: 2011-05-30 04:27    [from the cache]
©2003-2014 Jasper Spaans. hosted at Digital Ocean