linux-kernel - 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>] [day] [month] [year] [list]

Message-ID: <20221116140304.48333261@canb.auug.org.au>
Date:   Wed, 16 Nov 2022 14:03:04 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Christian Borntraeger <borntraeger@...ibm.com>,
        Janosch Frank <frankja@...ux.ibm.com>,
        Christoffer Dall <cdall@...columbia.edu>,
        Marc Zyngier <maz@...nel.org>
Cc:     Claudio Imbrenda <imbrenda@...ux.ibm.com>,
        Gavin Shan <gshan@...hat.com>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Oliver Upton <oliver.upton@...ux.dev>,
        Paolo Bonzini <pbonzini@...hat.com>
Subject: 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:

  86bdf3ebcfe1 ("KVM: Support dirty ring in conjunction with bitmap")

from the kvm-arm tree and commit:

  57ecc06995f9 ("KVM: s390: pv: add KVM_CAP_S390_PROTECTED_ASYNC_DISABLE")

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 c87b5882d7ae,d3f86a280858..000000000000
--- a/include/uapi/linux/kvm.h
+++ b/include/uapi/linux/kvm.h
@@@ -1178,7 -1178,7 +1178,8 @@@ struct kvm_ppc_resize_hpt 
  #define KVM_CAP_S390_ZPCI_OP 221
  #define KVM_CAP_S390_CPU_TOPOLOGY 222
  #define KVM_CAP_DIRTY_LOG_RING_ACQ_REL 223
 -#define KVM_CAP_S390_PROTECTED_ASYNC_DISABLE 224
 +#define KVM_CAP_DIRTY_LOG_RING_WITH_BITMAP 224
++#define KVM_CAP_S390_PROTECTED_ASYNC_DISABLE 225
  
  #ifdef KVM_CAP_IRQ_ROUTING
  

Content of type "application/pgp-signature" skipped