linux-next: manual merge of the kvm tree with Linus' tree

Commit Message

Stephen Rothwell July 13, 2022, 6:02 a.m. UTC

Hi all,

Today's linux-next merge of the kvm tree got a conflict in:

  arch/x86/kvm/vmx/capabilities.h

between commit:

  07853adc29a0 ("KVM: VMX: Prevent RSB underflow before vmenter")

from Linus' tree and commits:

  cf8e55fe50df ("KVM: x86/pmu: Expose CPUIDs feature bits PDCM, DS, DTES64")
  6ef25aa0a961 ("KVM: x86/pmu: Restrict advanced features based on module enable_pmu")

from the kvm tree.

I didn't know if the new includes needed to be prefixed with "../"
as well ... I though it was better safe than sorry.

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.

Comments

Paolo Bonzini July 13, 2022, 6:09 a.m. UTC | #1

On 7/13/22 08:02, Stephen Rothwell wrote:
> I didn't know if the new includes needed to be prefixed with "../"
> as well ... I though it was better safe than sorry.

If it compiles, it's perfect. :)

Thanks, I'll check it out and report to Linus the reason for the conflict.

Paolo

> 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.

Patch

diff --cc arch/x86/kvm/vmx/capabilities.h
index c0e24826a86f,069d8d298e1d..000000000000
--- a/arch/x86/kvm/vmx/capabilities.h