linux-kernel - linux-next: manual merge of the kvm-ppc tree with the kvm 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]

Date:	Mon, 21 May 2012 15:21:16 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Alexander Graf <agraf@...e.de>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Christian Borntraeger <borntraeger@...ibm.com>,
	Avi Kivity <avi@...ranet.com>,
	Marcelo Tosatti <mtosatti@...hat.com>,
	Paul Mackerras <paulus@...ba.org>
Subject: linux-next: manual merge of the kvm-ppc tree with the kvm tree

Hi Alexander,

Today's linux-next merge of the kvm-ppc tree got a conflict in
include/linux/kvm.h between commit 1526bf9ccf31 ("KVM: s390: add
capability indicating COW support") from the kvm tree and commit
6e8fce2c6cd3 ("KVM: PPC: Book3S HV: Make the guest hash table size
configurable") from the kvm-ppc tree.

I fixed it up (see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc include/linux/kvm.h
index 09f2b3a,fcc98df..0000000
--- a/include/linux/kvm.h
+++ b/include/linux/kvm.h
@@@ -616,7 -616,7 +616,8 @@@ struct kvm_ppc_smmu_info 
  #define KVM_CAP_KVMCLOCK_CTRL 76
  #define KVM_CAP_SIGNAL_MSI 77
  #define KVM_CAP_PPC_GET_SMMU_INFO 78
 -#define KVM_CAP_PPC_ALLOC_HTAB 79
 +#define KVM_CAP_S390_COW 79
++#define KVM_CAP_PPC_ALLOC_HTAB 80
  
  #ifdef KVM_CAP_IRQ_ROUTING
  

Content of type "application/pgp-signature" skipped