Re: linux-next: manual merge of the kvms390 tree with Linus' tree

2019-07-08 Thread Stephen Rothwell
Hi all, On Fri, 21 Jun 2019 15:43:15 +1000 Stephen Rothwell wrote: > > 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'

Re: linux-next: manual merge of the kvms390 tree with Linus' tree

2019-06-24 Thread Stephen Rothwell
Hi Christian, On Mon, 24 Jun 2019 19:52:09 +0200 Christian Borntraeger wrote: > > can you replace Conny with > > Janosch Frank > as contact fot kvms390-next? Done. -- Cheers, Stephen Rothwell pgpBqnivHmHh5.pgp Description: OpenPGP digital signature

Re: linux-next: manual merge of the kvms390 tree with Linus' tree

2019-06-24 Thread Christian Borntraeger
Stephen, can you replace Conny with Janosch Frank as contact fot kvms390-next? Thanks Christian On 21.06.19 07:43, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the kvms390 tree got a conflict in: > > tools/testing/selftests/kvm/Makefile > > between commit: > > 61

Re: linux-next: manual merge of the kvms390 tree with Linus' tree

2019-06-21 Thread Cornelia Huck
On Fri, 21 Jun 2019 15:43:15 +1000 Stephen Rothwell 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'

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

2019-06-20 Thread Stephen Rothwell
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 s39