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

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

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