On 12/01/16 14:31, James Hogan wrote: > Paolo/Leon: This also affects kvm_mips_get_one_ureg64() in patch 5 of my > MIPS KVM FPU patchset (mips/kvm: Support signed 64-bit KVM registers). > Are you okay to fix up the conflict when you apply?
I'll fix it while applying to my queue. Regards, Leon
