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
| ||
|
Date: Wed, 29 Mar 2017 14:08:32 +1100 From: Stephen Rothwell <sfr@...b.auug.org.au> To: Christian Borntraeger <borntraeger@...ibm.com>, Cornelia Huck <cornelia.huck@...ibm.com>, James Hogan <james.hogan@...tec.com> Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org, Fan Zhang <zhangfan@...ux.vnet.ibm.com> Subject: linux-next: manual merge of the kvms390 tree with the kvm-mips tree Hi all, Today's linux-next merge of the kvms390 tree got a conflict in: include/uapi/linux/kvm.h between commits: a8a3c426772e ("KVM: MIPS: Add VZ & TE capabilities") 578fd61d2d21 ("KVM: MIPS: Add 64BIT capability") from the kvm-mips tree and commit: 4e0b1ab72b8a ("KVM: s390: gs support for kvm guests") from the kvms390 tree. It looks like someone needs to arbitrate on these KVM_CAP_ numbers ... 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 1e1a6c728a18,c9d522765f8f..000000000000 --- a/include/uapi/linux/kvm.h +++ b/include/uapi/linux/kvm.h @@@ -887,9 -883,7 +887,10 @@@ struct kvm_ppc_resize_hpt #define KVM_CAP_PPC_MMU_RADIX 134 #define KVM_CAP_PPC_MMU_HASH_V3 135 #define KVM_CAP_IMMEDIATE_EXIT 136 -#define KVM_CAP_S390_GS 137 +#define KVM_CAP_MIPS_VZ 137 +#define KVM_CAP_MIPS_TE 138 +#define KVM_CAP_MIPS_64BIT 139 ++#define KVM_CAP_S390_GS 140 #ifdef KVM_CAP_IRQ_ROUTING
Powered by blists - more mailing lists