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

Commit Message

Stephen Rothwell April 6, 2023, 3:06 a.m. UTC

Hi all,

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

  arch/arm64/kvm/arm.c

between commit:

  d8708b80fa0e ("KVM: Change return type of kvm_arch_vm_ioctl() to "int"")

from the kvm tree and commit:

  e0fc6b21616d ("KVM: arm64: Add vm fd device attribute accessors")

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 arch/arm64/kvm/arm.c
index aaa752be3776,4ec888fdd4f7..000000000000
--- a/arch/arm64/kvm/arm.c