linux-kernel - linux-next: manual merge of the kvm tree with the kvm-fixes 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>] [day] [month] [year] [list]

Message-Id: <20220223200019.1891646-1-broonie@kernel.org>
Date:   Wed, 23 Feb 2022 20:00:19 +0000
From:   broonie@...nel.org
To:     Paolo Bonzini <pbonzini@...hat.com>, KVM <kvm@...r.kernel.org>
Cc:     Christian Borntraeger <borntraeger@...ux.ibm.com>,
        Janis Schoetterl-Glausch <scgl@...ux.ibm.com>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Nicholas Piggin <npiggin@...il.com>
Subject: linux-next: manual merge of the kvm tree with the kvm-fixes tree

Hi all,

FIXME: Add owner of second tree to To:
       Add author(s)/SOB of conflicting commits.

Today's linux-next merge of the kvm tree got a conflict in:

  include/uapi/linux/kvm.h

between commit:

  93b71801a8274 ("KVM: PPC: reserve capability 210 for KVM_CAP_PPC_AIL_MODE_3")

from the kvm-fixes tree and commit:

  d004079edc166 ("KVM: s390: Add capability for storage key extension of MEM_OP IOCTL")

from the kvm 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.

diff --cc include/uapi/linux/kvm.h
index 507ee1f2aa96b,dbc550bbd9fa3..0000000000000
--- a/include/uapi/linux/kvm.h
+++ b/include/uapi/linux/kvm.h
@@@ -1134,7 -1140,7 +1140,8 @@@ struct kvm_ppc_resize_hpt 
  #define KVM_CAP_VM_GPA_BITS 207
  #define KVM_CAP_XSAVE2 208
  #define KVM_CAP_SYS_ATTRIBUTES 209
 -#define KVM_CAP_S390_MEM_OP_EXTENSION 210
 +#define KVM_CAP_PPC_AIL_MODE_3 210
++#define KVM_CAP_S390_MEM_OP_EXTENSION 211
  
  #ifdef KVM_CAP_IRQ_ROUTING