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

2017-07-02 Thread Stephen Rothwell
Hi all, [cc'ing kvm tree maintainers] Withe the merge window opening, just a reminder that this conflict still exists. On Thu, 22 Jun 2017 12:59:28 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the kvms390 tree got a conflict in: > > arch/s390/kvm/gaccess.c > > between comm

linux-next: manual merge of the kvms390 tree with the s390 tree

2017-06-21 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the kvms390 tree got a conflict in: arch/s390/kvm/gaccess.c between commit: a75259825401 ("s390: rename struct psw_bits members") from the s390 tree and commit: 8993df124642 ("KVM: s390: implement instruction execution protection for emulated") from

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

2017-04-26 Thread Christian Borntraeger
On 04/27/2017 05:29 AM, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the kvms390 tree got a conflict in: > > arch/s390/include/asm/cpacf.h > > between commit: > > 985a9d20daa6 ("s390/crypto: Renaming PPNO to PRNO.") > > from the s390 tree and commit: > > 152c1c8d60e

linux-next: manual merge of the kvms390 tree with the s390 tree

2017-04-26 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the kvms390 tree got a conflict in: arch/s390/include/asm/cpacf.h between commit: 985a9d20daa6 ("s390/crypto: Renaming PPNO to PRNO.") from the s390 tree and commit: 152c1c8d60eb ("s390/cpacf: Introduce kma instruction") from the kvms390 tree. I fix

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

2016-11-23 Thread Heiko Carstens
On Wed, Nov 23, 2016 at 09:24:17AM +0100, Christian Borntraeger wrote: > On 11/23/2016 04:45 AM, Stephen Rothwell wrote: > > Hi all, > > > > Today's linux-next merge of the kvms390 tree got a conflict in: > > > > arch/s390/include/asm/facilities_src.h > > > > between commit: > > > > d1f7e8f

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

2016-11-23 Thread Christian Borntraeger
On 11/23/2016 04:45 AM, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the kvms390 tree got a conflict in: > > arch/s390/include/asm/facilities_src.h > > between commit: > > d1f7e8f85b51 ("s390: squash facilities_src.h into gen_facilities.c") > > from the s390 tree and c

linux-next: manual merge of the kvms390 tree with the s390 tree

2016-11-22 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the kvms390 tree got a conflict in: arch/s390/include/asm/facilities_src.h between commit: d1f7e8f85b51 ("s390: squash facilities_src.h into gen_facilities.c") from the s390 tree and commits: 09ff894457e9 ("KVM: s390: gaccess: add ESOP2 handling") 8

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

2016-06-14 Thread Christian Borntraeger
On 06/14/2016 06:51 AM, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the kvms390 tree got a conflict in: > > arch/s390/hypfs/hypfs_diag.c > > between commit: > > 6c22c9863760 ("s390: avoid extable collisions") > > from the s390 tree and commit: > > e65f30e0cb29 ("s3

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

2016-06-13 Thread Heiko Carstens
On Tue, Jun 14, 2016 at 02:51:17PM +1000, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the kvms390 tree got a conflict in: > > arch/s390/hypfs/hypfs_diag.c > > between commit: > > 6c22c9863760 ("s390: avoid extable collisions") > > from the s390 tree and commit: > >

linux-next: manual merge of the kvms390 tree with the s390 tree

2016-06-13 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the kvms390 tree got a conflict in: arch/s390/hypfs/hypfs_diag.c between commit: 6c22c9863760 ("s390: avoid extable collisions") from the s390 tree and commit: e65f30e0cb29 ("s390: hypfs: Move diag implementation and data definitions") from the kvms3

linux-next: manual merge of the kvms390 tree with the s390 tree

2015-07-21 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the kvms390 tree got a conflict in: arch/s390/kernel/entry.S between commit: 2a1a14484b97 ("s390/kernel: lazy restore fpu registers") 3af40983a937 ("s390/kvm: fix interrupt race with HANDLE_SIE_INTERCEPT") 0be8cda612d8 ("s390/kvm: integrate HANDLE_SIE