On Tue, May 22, 2012 at 6:08 AM, Avi Kivity <avi@xxxxxxxxxx> wrote: > Linus, please pull the KVM updates for the 3.5 cycle from Ok. The way I resolved a the x86 kvm_para.h conflict, I suspect it is now being *unnecessarily* careful about doing the CPUID thing, and I think that the "cpuid_level < 0" check that came in through the x86 tree can be removed in favor of the KVM one. But I left both checks in as the obvious non-semantic resolution, and if you guys decide that it's redundant, you can remove it later. Linus -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html