| Message ID | 20220120092527.71e3a85f@canb.auug.org.au (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | linux-next: manual merge of the kvm-fixes tree with Linus' tree | expand |
On 1/19/22 23:25, Stephen Rothwell wrote:
> It may be worth while rebasing this fix on top of Linus' current tree.
Yes, the next pull request will include a merge commit to avoid the
conflict.
Paolo
diff --cc arch/x86/kvm/vmx/posted_intr.c index 88c53c521094,21ea58d25771..000000000000 --- a/arch/x86/kvm/vmx/posted_intr.c
Hi all, Today's linux-next merge of the kvm-fixes tree got a conflict in: arch/x86/kvm/vmx/posted_intr.c between commits: c95717218add ("KVM: VMX: Drop unnecessary PI logic to handle impossible conditions") 29802380b679 ("KVM: VMX: Drop pointless PI.NDST update when blocking") 89ef0f21cf96 ("KVM: VMX: Save/restore IRQs (instead of CLI/STI) during PI pre/post block") cfb0e1306a37 ("KVM: VMX: Read Posted Interrupt "control" exactly once per loop iteration") baed82c8e489 ("KVM: VMX: Remove vCPU from PI wakeup list before updating PID.NV") 45af1bb99b72 ("KVM: VMX: Clean up PI pre/post-block WARNs") from Linus' tree and commit: 5f02ef741a78 ("KVM: VMX: switch blocked_vcpu_on_cpu_lock to raw spinlock") from the kvm-fixes tree. I fixed it up (I think - 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. It may be worth while rebasing this fix on top of Linus' current tree.