Merge branch 'x86/hyperv' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
authorRadim Krčmář <rkrcmar@redhat.com>
Thu, 1 Feb 2018 14:04:17 +0000 (15:04 +0100)
committerRadim Krčmář <rkrcmar@redhat.com>
Thu, 1 Feb 2018 14:04:17 +0000 (15:04 +0100)
commit7bf14c28ee776be567855bd39ed8ff795ea19f55
tree6113748c673e85fccc2c56c050697789c00c6bc2
parent87cedc6be55954c6efd6eca2e694132513f65a2a
parent5fa4ec9cb2e6679e2f828033726f758ea314b9c5
Merge branch 'x86/hyperv' of git://git./linux/kernel/git/tip/tip

Topic branch for stable KVM clockource under Hyper-V.

Thanks to Christoffer Dall for resolving the ARM conflict.
23 files changed:
Documentation/virtual/kvm/api.txt
MAINTAINERS
arch/arm64/include/asm/assembler.h
arch/arm64/kvm/hyp/debug-sr.c
arch/powerpc/kvm/powerpc.c
arch/s390/include/asm/kvm_host.h
arch/s390/kvm/kvm-s390.c
arch/s390/kvm/priv.c
arch/s390/kvm/vsie.c
arch/x86/include/asm/cpufeatures.h
arch/x86/include/asm/msr-index.h
arch/x86/kernel/cpu/amd.c
arch/x86/kernel/cpu/scattered.c
arch/x86/kvm/emulate.c
arch/x86/kvm/mmu.c
arch/x86/kvm/svm.c
arch/x86/kvm/vmx.c
arch/x86/kvm/x86.c
include/kvm/arm_arch_timer.h
include/uapi/linux/kvm.h
virt/kvm/arm/arch_timer.c
virt/kvm/arm/arm.c
virt/kvm/arm/mmu.c