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

2020-07-15 Thread Christian Borntraeger
On 15.07.20 18:25, Collin Walling wrote: > On 7/13/20 12:50 AM, Stephen Rothwell wrote: >> Hi all, >> >> Today's linux-next merge of the kvms390 tree got a conflict in: >> >> include/uapi/linux/kvm.h >> >> between commit: >> >> 1aa561b1a4c0 ("kvm: x86: Add "last CPU" to some KVM_EXIT informa

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

2020-07-15 Thread Collin Walling
On 7/13/20 12:50 AM, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the kvms390 tree got a conflict in: > > include/uapi/linux/kvm.h > > between commit: > > 1aa561b1a4c0 ("kvm: x86: Add "last CPU" to some KVM_EXIT information") > > from the kvm tree and commit: > > 23

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

2020-07-12 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the kvms390 tree got a conflict in: include/uapi/linux/kvm.h between commit: 1aa561b1a4c0 ("kvm: x86: Add "last CPU" to some KVM_EXIT information") from the kvm tree and commit: 23a60f834406 ("s390/kvm: diagnose 0x318 sync and reset") from the kvms39

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

2015-11-20 Thread Christian Borntraeger
On 11/20/2015 02:47 AM, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the kvms390 tree got a conflict in: > > include/linux/kvm_host.h > arch/s390/kvm/interrupt.c > arch/s390/kvm/sigp.c > > between commits: > > db27a7a37aa0 ("KVM: Provide function for VCPU lookup by

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

2015-11-19 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the kvms390 tree got a conflict in: include/linux/kvm_host.h arch/s390/kvm/interrupt.c arch/s390/kvm/sigp.c between commits: db27a7a37aa0 ("KVM: Provide function for VCPU lookup by id") b85de33a1a34 ("KVM: s390: avoid memory overwrites on emergency

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

2015-04-07 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the kvms390 tree got a conflict in include/uapi/linux/kvm.h between commits 5fafd8748b36 ("MIPS: KVM: Wire up FPU capability") and d952bd070f79 ("MIPS: KVM: Wire up MSA capability") from the kvm tree and commits 47b43c52ee4b ("KVM: s390: add ioctl to inject loca