diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2017-08-25 08:56:22 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2017-08-25 08:56:22 +0200 |
| commit | c0bb80cfa3c37fd92f066e328d83656067519a5f (patch) | |
| tree | fad29579615daaf7d36364e4b45702db0c709044 /arch/x86/kvm | |
| parent | adfaf18334cbf16c563e4ebc67e968ea1b17ec51 (diff) | |
| parent | ecda85e70277ef24e44a1f6bc00243cebd19f985 (diff) | |
Merge branch 'x86/asm' into x86/apic
Pick up dependent changes to avoid merge conflicts
Diffstat (limited to 'arch/x86/kvm')
| -rw-r--r-- | arch/x86/kvm/Kconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/x86/kvm/Kconfig b/arch/x86/kvm/Kconfig index 2688c7dc5323..3ea624452f93 100644 --- a/arch/x86/kvm/Kconfig +++ b/arch/x86/kvm/Kconfig @@ -89,6 +89,5 @@ config KVM_MMU_AUDIT # OK, it's a little counter-intuitive to do this, but it puts it neatly under # the virtualization menu. source drivers/vhost/Kconfig -source drivers/lguest/Kconfig endif # VIRTUALIZATION |