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

[Stephen Rothwell]

Hi all,

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

  arch/arm64/kvm/arm.c

between commit:

  fa808ed4e199 ("KVM: arm64: Ensure a VMID is allocated before programming VTTBR_EL2")

from Linus' tree and commit:

  4b1b97f0d7cf ("KVM: arm64: nv: Handle L2->L1 transition on interrupt injection")

from the kvm-arm tree.

I fixed it up (I used the former - the latter just updated the comment
removed by the former) 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.

-- 
Cheers,
Stephen Rothwell

Attachment: pgp7MO4njxWyR.pgp
Description: OpenPGP digital signature