linux-next: manual merge of the kvm tree with the kvm-fixes tree

2019-02-17 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the kvm tree got conflicts in: arch/x86/kvm/vmx/vmx.c arch/x86/kvm/vmx/vmx.h between commit: c112b5f50232 ("KVM: x86: Recompute PID.ON when clearing PID.SN") from the kvm-fixes tree and commit: abd2fb15a57e ("KVM: x86: Sync the pending Posted-Interr

linux-next: manual merge of the kvm tree with the kvm-fixes tree

2018-03-28 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the kvm tree got a conflict in: arch/x86/kvm/vmx.c between commit: 9d1887ef3252 ("KVM: nVMX: sync vmcs02 segment regs prior to vmx_set_cr0") from the kvm-fixes tree and commit: 2bb8cafea80b ("KVM: vVMX: signal failure for nested VMEntry if emulation_

linux-next: manual merge of the kvm tree with the kvm-fixes tree

2018-03-28 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the kvm tree got conflicts in: arch/x86/kernel/kvm.c between commit: 17a1079d9c63 ("KVM: x86: Fix pv tlb flush dependencies") from the kvm-fixes tree and commit: 6beacf74c257 ("KVM: X86: Don't use PV TLB flush with dedicated physical CPUs") from the

linux-next: manual merge of the kvm tree with the kvm-fixes tree

2018-03-25 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the kvm tree got a conflict in: arch/x86/kvm/vmx.c between commit: 9d1887ef3252 ("KVM: nVMX: sync vmcs02 segment regs prior to vmx_set_cr0") from the kvm-fixes tree and commit: 2bb8cafea80b ("KVM: vVMX: signal failure for nested VMEntry if emulation_