On Fri, 21 Jun 2019 15:43:15 +1000 Stephen Rothwell <s...@canb.auug.org.au> wrote:
> Hi all,
>
> Today's linux-next merge of the kvms390 tree got a conflict in:
>
> tools/testing/selftests/kvm/Makefile
>
> between commit:
>
> 61cfcd545e42 ("kvm: tests: Sort tests in the Makefile alphabetically")
>
> from Linus' tree and commits:
>
> ee1563f42856 ("KVM: selftests: Add the sync_regs test for s390x")
> 49fe9a5d1638 ("KVM: selftests: Move kvm_create_max_vcpus test to generic
> code")
>
> from the kvms390 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.
>
Thanks, looks good.
pgpWloyzy6Iwj.pgp
Description: OpenPGP digital signature
