Merge branch 'kvm-tsx-ctrl' into HEAD
authorPaolo Bonzini <pbonzini@redhat.com>
Thu, 21 Nov 2019 09:01:51 +0000 (10:01 +0100)
committerPaolo Bonzini <pbonzini@redhat.com>
Thu, 21 Nov 2019 11:03:40 +0000 (12:03 +0100)
commit46f4f0aabc61bfd365e1eb3c8a6d766d1a49cf32
treef98a256ff3e4b20ca6252f7f80ce17759e57c6f2
parent14edff88315add29099fd8eebb9ef989c2e47c18
parentb07a5c53d42a8c87b208614129e947dd2338ff9c
Merge branch 'kvm-tsx-ctrl' into HEAD

Conflicts:
arch/x86/kvm/vmx/vmx.c
16 files changed:
Documentation/admin-guide/kernel-parameters.txt
arch/arm64/kernel/cpu_errata.c
arch/x86/include/asm/kvm_host.h
arch/x86/kvm/lapic.c
arch/x86/kvm/lapic.h
arch/x86/kvm/mmu.c
arch/x86/kvm/svm.c
arch/x86/kvm/vmx/nested.c
arch/x86/kvm/vmx/nested.h
arch/x86/kvm/vmx/vmx.c
arch/x86/kvm/vmx/vmx.h
arch/x86/kvm/x86.c
include/linux/kvm_host.h
include/linux/perf_event.h
kernel/events/core.c
virt/kvm/kvm_main.c