On Tue, Jun 23, 2015 at 9:49 AM, Paolo Bonzini <pbonzini@xxxxxxxxxx> wrote: > > There are some x86 conflicts, one with the rc8 pull request and > the rest with Ingo's FPU rework. Hmm. I'm dropping the "fx_init(..init_state)" changes from you pull request, since fx_init is static and only has one caller, and that one had init_state being false. Was there something I missed? That was true even in your tree, regardless of Ingo's FPU changes? If you will grow a second user with init_state set to "true", you'll have to re-do your patch. 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