diff options
| author | David S. Miller <davem@davemloft.net> | 2015-02-12 06:48:14 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-02-12 06:48:14 +0300 |
| commit | 855e7e7174bade3f2b63077a81eea5aab525dbf6 (patch) | |
| tree | 3423eb92315865d76cb8d488513bfef6ab9251d0 /arch/arm/kvm/Kconfig | |
| parent | e09dcd2e7913aa50b5cb4836bc1e990e429e4aff (diff) | |
| parent | 59d53737a8640482995fea13c6e2c0fd016115d6 (diff) | |
| download | linux-855e7e7174bade3f2b63077a81eea5aab525dbf6.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
I pushed a version of the crypto iov_iter bug fix that
Al Viro wrote, but Linus put in a different copy of the
same fix into his tree.
I then reverted my commit in net-next, and that's why we have a merge
when pulling in Linus's tree.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/arm/kvm/Kconfig')
| -rw-r--r-- | arch/arm/kvm/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/kvm/Kconfig b/arch/arm/kvm/Kconfig index 466bd299b1a8..3afee5f40f4f 100644 --- a/arch/arm/kvm/Kconfig +++ b/arch/arm/kvm/Kconfig @@ -23,6 +23,7 @@ config KVM select HAVE_KVM_CPU_RELAX_INTERCEPT select KVM_MMIO select KVM_ARM_HOST + select SRCU depends on ARM_VIRT_EXT && ARM_LPAE ---help--- Support hosting virtualized guest machines. You will also |