From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Christoffer Dall <cdall@cs•columbia.edu>,
Marc Zyngier <marc.zyngier@arm•com>,
"Paul E. McKenney" <paulmck@linux•vnet.ibm.com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Pranith Kumar <bobby.prani@gmail•com>,
Mario Smarduch <m.smarduch@samsung•com>
Subject: linux-next: manual merge of the kvm-arm tree with the rcu tree
Date: Thu, 22 Jan 2015 15:57:38 +1100 [thread overview]
Message-ID: <20150122155738.3b0e5402@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 987 bytes --]
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@canb•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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
next reply other threads:[~2015-01-22 4:57 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-01-22 4:57 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2015-01-22 5:09 linux-next: manual merge of the kvm-arm tree with the rcu tree Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20150122155738.3b0e5402@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=bobby.prani@gmail$(echo .)com \
--cc=cdall@cs$(echo .)columbia.edu \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=m.smarduch@samsung$(echo .)com \
--cc=marc.zyngier@arm$(echo .)com \
--cc=paulmck@linux$(echo .)vnet.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox