Subject: linux-next: manual merge of the kvm-arm tree with the rcu tree

From: Stephen Rothwell <[email-masked]>
Date: Thu, 22 Jan 2015 16:09:11 +1100

Hi all,

Today's linux-next merge of the kvm-arm tree got a conflict in
arch/arm64/kvm/Kconfig between commit 83fe27ea5311 ("rcu: Make SRCU
optional by using CONFIG_SRCU") from the rcu tree and commit
7276030a082c ("KVM: arm/arm64: Enable Dirty Page logging for ARMv8")
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                    [email-masked]

diff --cc arch/arm64/kvm/Kconfig
index b334084d3675,3ce389b3c21c..000000000000
--- a/arch/arm64/kvm/Kconfig
+++ b/arch/arm64/kvm/Kconfig
@@@ -26,7 -27,7 +27,8 @@@ config KV
  	select KVM_ARM_HOST
  	select KVM_ARM_VGIC
  	select KVM_ARM_TIMER
+ 	select KVM_GENERIC_DIRTYLOG_READ_PROTECT
 +	select SRCU
  	---help---
  	  Support hosting virtualized guest machines.