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

Commit Message

Stephen Rothwell June 25, 2021, 5:20 a.m. UTC

Hi all,

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

  include/uapi/linux/kvm.h

between commits:

  cb082bfab59a ("KVM: stats: Add fd-based API to read binary stats data")
  19238e75bd8e ("kvm: x86: Allow userspace to handle emulation errors")

from the kvm tree and commit:

  ea7fc1bb1cd1 ("KVM: arm64: Introduce MTE VM feature")

from the kvm-arm 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 include/uapi/linux/kvm.h
index 68c9e6d8bbda,da1edd2b4046..000000000000
--- a/include/uapi/linux/kvm.h