linux-kernel - linux-next: manual merge of the kvm-arm tree with the rcu 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:	Thu, 22 Jan 2015 15:57:38 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Christoffer Dall <cdall@...columbia.edu>,
	Marc Zyngier <marc.zyngier@....com>,
	"Paul E. McKenney" <paulmck@...ux.vnet.ibm.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Pranith Kumar <bobby.prani@...il.com>,
	Mario Smarduch <m.smarduch@...sung.com>
Subject: linux-next: manual merge of the kvm-arm tree with the rcu tree

Hi all,

Today's linux-next merge of the kvm-arm tree got a conflict in
arch/arm/kvm/Kconfig between commit 83fe27ea5311 ("rcu: Make SRCU
optional by using CONFIG_SRCU") from the rcu tree and commit
53c810c364d7 ("KVM: arm: dirty logging write protect support") from the
kvm-arm tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc arch/arm/kvm/Kconfig
index 3afee5f40f4f,a8d1ace3ea51..000000000000
--- a/arch/arm/kvm/Kconfig
+++ b/arch/arm/kvm/Kconfig
@@@ -21,9 -21,10 +21,11 @@@ config KV
  	select PREEMPT_NOTIFIERS
  	select ANON_INODES
  	select HAVE_KVM_CPU_RELAX_INTERCEPT
+ 	select HAVE_KVM_ARCH_TLB_FLUSH_ALL
  	select KVM_MMIO
  	select KVM_ARM_HOST
+ 	select KVM_GENERIC_DIRTYLOG_READ_PROTECT
 +	select SRCU
  	depends on ARM_VIRT_EXT && ARM_LPAE
  	---help---
  	  Support hosting virtualized guest machines. You will also

Content of type "application/pgp-signature" skipped