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

Commit Message

Stephen Rothwell July 15, 2022, 5:55 a.m. UTC

Hi all,

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

  arch/x86/kvm/x86.c

between commit:

  1b870fa5573e ("kvm: stats: tell userspace which values are boolean")

from the kvm-fixes 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.

Patch

diff --cc arch/x86/kvm/x86.c
index af0c5b5fc28f,031678eff28e..000000000000
--- a/arch/x86/kvm/x86.c