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@xxxxxxxxxxxxxxxx http://www.canb.auug.org.au/~sfr/
Attachment:
pgpftCCsfNm5y.pgp
Description: PGP signature
