Paolo Bonzini 46f4f0aabc Merge branch 'kvm-tsx-ctrl' into HEAD ... Conflicts: arch/x86/kvm/vmx/vmx.c		2019-11-21 12:03:40 +01:00
..
asm	Merge branch 'kvm-tsx-ctrl' into HEAD	2019-11-21 12:03:40 +01:00
uapi/asm	KVM: PPC: Book3S HV: XIVE: Allow userspace to set the # of VPs	2019-10-22 16:29:02 +11:00