| Message ID | 20220609103313.0f05e4b5@canb.auug.org.au (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | linux-next: manual merge of the kvm tree with Linus' tree | expand |
diff --cc arch/x86/kvm/x86.c index 2ec6a110ec6c,79efdc19b4c8..000000000000 --- a/arch/x86/kvm/x86.c
Hi all, Today's linux-next merge of the kvm tree got a conflict in: arch/x86/kvm/x86.c between commit: 6cd88243c7e0 ("KVM: x86: do not report a vCPU as preempted outside instruction boundaries") from Linus' tree and commit: 2f4073e08f4c ("KVM: VMX: Enable Notify VM exit") from the kvm tree. I fixed it up (see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts.