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

2015-01-21 Thread Stephen Rothwell
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

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

2015-01-21 Thread Stephen Rothwell
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

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

2015-01-21 Thread Stephen Rothwell
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

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

2015-01-21 Thread Stephen Rothwell
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