Re: [GIT PULL] First batch of KVM changes for 4.2

2015-06-24 Thread Paolo Bonzini
On 24/06/2015 18:33, Linus Torvalds wrote: > On Tue, Jun 23, 2015 at 9:49 AM, Paolo Bonzini 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, sinc

Re: [GIT PULL] First batch of KVM changes for 4.2

2015-06-24 Thread Linus Torvalds
On Tue, Jun 23, 2015 at 9:49 AM, Paolo Bonzini 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 h