lkml.org 
[lkml]   [2018]   [Aug]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
SubjectRe: linux-next: manual merge of the kvms390 tree with the kvm-arm tree
From
Date
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.

Thanks,

Paolo

[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2018-08-02 15:20    [W:0.058 / U:2.140 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site