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 for Android: free password hash cracker in your pocket

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

Date:	Tue, 4 Sep 2012 15:04:30 +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,
	Xiao Guangrong <xiaoguangrong@...ux.vnet.ibm.com>,
	Avi Kivity <avi@...hat.com>,
	Bharat Bhushan <r65777@...escale.com>,
	Scott Wood <scottwood@...escale.com>,
	Liu Yu <yu.liu@...escale.com>
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 4d8b81abc47b ("KVM: introduce readonly
memslot") from the kvm tree and commit 1db21d25a11b ("KVM: PPC: booke:
Add watchdog emulation") 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 d808694,f4f5be8..0000000
--- a/include/linux/kvm.h
+++ b/include/linux/kvm.h
@@@ -622,9 -621,7 +625,10 @@@ struct kvm_ppc_smmu_info 
  #define KVM_CAP_PPC_GET_SMMU_INFO 78
  #define KVM_CAP_S390_COW 79
  #define KVM_CAP_PPC_ALLOC_HTAB 80
 -#define KVM_CAP_PPC_BOOKE_WATCHDOG 81
 +#ifdef __KVM_HAVE_READONLY_MEM
 +#define KVM_CAP_READONLY_MEM 81
 +#endif
++#define KVM_CAP_PPC_BOOKE_WATCHDOG 82
  
  #ifdef KVM_CAP_IRQ_ROUTING
  

Content of type "application/pgp-signature" skipped