On 25/01/2017 18:26, Phil Dennis-Jordan wrote: > On 24 January 2017 at 12:58, Paolo Bonzini <pbonzini@xxxxxxxxxx> wrote: >> Looks good, thanks! Queued patches 1 and 3 for 2.9 (patch 2 is in already). > > Awesome, thanks for your help! > > As there are now some minor merge conflicts with upstream, I've > rebased the remaining 2 patches on latest master, they're in the > vmware-cpuid-freq branch at https://github.com/pmj/qemu.git - in case > that makes your job of merging them a bit easier. I'll compare them with my own resolution, thanks! Paolo
