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: Windows password security audit tool. GUI, reports in PDF.

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

Message-ID: <20180802111916.7435c0ac@canb.auug.org.au>
Date:   Thu, 2 Aug 2018 11:19:16 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     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>,
        Paolo Bonzini <pbonzini@...hat.com>,
        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

Hi all,

On Tue, 31 Jul 2018 14:23:39 +1000 Stephen Rothwell <sfr@...b.auug.org.au> 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-arm tree and commit:
> 
>   a449938297e5 ("KVM: s390: Add huge page enablement control")
> 
> from the kvms390 tree.
> 
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging.  You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
> 
> -- 
> Cheers,
> Stephen Rothwell
> 
> diff --cc include/uapi/linux/kvm.h
> index a7d9bc4e4068,b955b986b341..000000000000
> --- a/include/uapi/linux/kvm.h
> +++ b/include/uapi/linux/kvm.h
> @@@ -949,7 -949,7 +949,8 @@@ struct kvm_ppc_resize_hpt 
>   #define KVM_CAP_GET_MSR_FEATURES 153
>   #define KVM_CAP_HYPERV_EVENTFD 154
>   #define KVM_CAP_HYPERV_TLBFLUSH 155
>  -#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.

-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped