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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <632a8205-4344-3f6d-9216-ea623a32392a@redhat.com>
Date:   Thu, 2 Aug 2018 15:18:57 +0200
From:   Paolo Bonzini <pbonzini@...hat.com>
To:     Stephen Rothwell <sfr@...b.auug.org.au>,
        Christian Borntraeger <borntraeger@...ibm.com>,
        Cornelia Huck <cohuck@...hat.com>,
        Christoffer Dall <cdall@...columbia.edu>,
        Marc Zyngier <marc.zyngier@....com>,
        Martin Schwidefsky <schwidefsky@...ibm.com>,
        Heiko Carstens <heiko.carstens@...ibm.com>
Cc:     Linux-Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Radim Krčmář <rkrcmar@...hat.com>,
        KVM <kvm@...r.kernel.org>, Dongjiu Geng <gengdongjiu@...wei.com>,
        Janosch Frank <frankja@...ux.ibm.com>
Subject: 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 to the KVM tree.  The ARM capability will have to
be bumped again since x86 "won" number 157.

Thanks,

Paolo



Download attachment "signature.asc" of type "application/pgp-signature" (489 bytes)