Re: linux-next: manual merge of the kvms390 tree with Linus' tree
From: Christian Borntraeger
Date: Mon Jun 24 2019 - 13:54:17 EST
can you replace Conny with
Janosch Frank <frankja@xxxxxxxxxxxxx>
as contact fot kvms390-next?
On 21.06.19 07:43, Stephen Rothwell wrote:
> Hi all,
> Today's linux-next merge of the kvms390 tree got a conflict in:
> 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.