> 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 -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
