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

On 02/08/2018 03:19, Stephen Rothwell wrote: >> -#define KVM_CAP_S390_HPAGE_1M 156 >> +#define KVM_CAP_ARM_INJECT_SERROR_ESR 156 >> ++#define KVM_CAP_S390_HPAGE_1M 157 >> >> #ifdef KVM_CAP_IRQ_ROUTING >> > This is now a conflict between the s390 and kvm-arm trees. This will shortly move

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

Hi all, On Tue, 31 Jul 2018 14:23:39 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the kvms390 tree got a conflict in: > > include/uapi/linux/kvm.h > > between commit: > > be26b3a73413 ("arm64: KVM: export the capability to set guest SError > syndrome") > > from the kvm-

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

Hi all, Today's linux-next merge of the kvms390 tree got a conflict in: include/uapi/linux/kvm.h between commit: be26b3a73413 ("arm64: KVM: export the capability to set guest SError syndrome") from the kvm-arm tree and commit: a449938297e5 ("KVM: s390: Add huge page enablement control"

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

On 06/28/2017 08:02 AM, Stephen Rothwell wrote: > Hi all, > > On Fri, 9 Jun 2017 14:28:56 +1000 Stephen Rothwell > wrote: >> >> Today's linux-next merge of the kvms390 tree got a conflict in: >> >> arch/s390/include/asm/kvm_host.h >> >> between commit: >> >> 2387149eade2 ("KVM: improve arch

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

Hi all, On Fri, 9 Jun 2017 14:28:56 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the kvms390 tree got a conflict in: > > arch/s390/include/asm/kvm_host.h > > between commit: > > 2387149eade2 ("KVM: improve arch vcpu request defining") > > from the kvm-arm tree and commit

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

Hi all, Today's linux-next merge of the kvms390 tree got a conflict in: arch/s390/include/asm/kvm_host.h between commit: 2387149eade2 ("KVM: improve arch vcpu request defining") from the kvm-arm tree and commit: 8611a6a64661 ("KVM: s390: CMMA tracking, ESSA emulation, migration mode")

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

Hi all, Today's linux-next merge of the kvms390 tree got a conflict in: include/uapi/linux/kvm.h between commit: 2b8ddd9337ee ("KVM: Extend struct kvm_msi to hold a 32-bit device ID") from the kvm-arm tree and commit: 6502a34cfd66 ("KVM: s390: allow user space to handle instr 0x")