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

Commit Message

Stephen Rothwell June 24, 2022, 4:09 a.m. UTC

Hi all,

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

  tools/testing/selftests/kvm/lib/aarch64/ucall.c

between commit:

  9e2f6498efbb ("selftests: KVM: Handle compiler optimizations in ucall")

from the kvm-fixes tree and commit:

  5d9cd8b55cdc ("selftests: kvm: replace ternary operator with min()")

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 tools/testing/selftests/kvm/lib/aarch64/ucall.c
index be1d9728c4ce,0b949ee06b5e..000000000000
--- a/tools/testing/selftests/kvm/lib/aarch64/ucall.c