Re: linux-next: manual merge of the kvms390 tree with the kvm-arm tree
From: Paolo Bonzini
Date: Thu Aug 02 2018 - 12:04:32 EST
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 to the KVM tree. The ARM capability will have to
be bumped again since x86 "won" number 157.
Description: OpenPGP digital signature