git.kernel.dk Git - linux-2.6-block.git/commit

author	Radim Krčmář <rkrcmar@redhat.com>
	Thu, 1 Feb 2018 14:04:17 +0000 (15:04 +0100)
committer	Radim Krčmář <rkrcmar@redhat.com>
	Thu, 1 Feb 2018 14:04:17 +0000 (15:04 +0100)
commit	7bf14c28ee776be567855bd39ed8ff795ea19f55
tree	6113748c673e85fccc2c56c050697789c00c6bc2	tree \| snapshot
parent	87cedc6be55954c6efd6eca2e694132513f65a2a	commit \| diff
parent	5fa4ec9cb2e6679e2f828033726f758ea314b9c5	commit \| diff

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	diff1 \|	diff2 \|	blob \| history
MAINTAINERS	diff1 \|	diff2 \|	blob \| history
arch/arm64/include/asm/assembler.h	diff1 \|	diff2 \|	blob \| history
arch/arm64/kvm/hyp/debug-sr.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/kvm/powerpc.c	diff1 \|	diff2 \|	blob \| history
arch/s390/include/asm/kvm_host.h	diff1 \|	diff2 \|	blob \| history
arch/s390/kvm/kvm-s390.c	diff1 \|	diff2 \|	blob \| history
arch/s390/kvm/priv.c	diff1 \|	diff2 \|	blob \| history
arch/s390/kvm/vsie.c	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/cpufeatures.h	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/msr-index.h	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/cpu/amd.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/cpu/scattered.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kvm/emulate.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kvm/mmu.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kvm/svm.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kvm/vmx.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kvm/x86.c	diff1 \|	diff2 \|	blob \| history
include/kvm/arm_arch_timer.h	diff1 \|	diff2 \|	blob \| history
include/uapi/linux/kvm.h	diff1 \|	diff2 \|	blob \| history
virt/kvm/arm/arch_timer.c	diff1 \|	diff2 \|	blob \| history
virt/kvm/arm/arm.c	diff1 \|	diff2 \|	blob \| history
virt/kvm/arm/mmu.c	diff1 \|	diff2 \|	blob \| history

Linux 6.x block layer and io_uring tree(s)

RSS Atom

Documentation/virtual/kvm/api.txt	diff1 \|	diff2 \|	blob \| history
MAINTAINERS	diff1 \|	diff2 \|	blob \| history
arch/arm64/include/asm/assembler.h	diff1 \|	diff2 \|	blob \| history
arch/arm64/kvm/hyp/debug-sr.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/kvm/powerpc.c	diff1 \|	diff2 \|	blob \| history
arch/s390/include/asm/kvm_host.h	diff1 \|	diff2 \|	blob \| history
arch/s390/kvm/kvm-s390.c	diff1 \|	diff2 \|	blob \| history
arch/s390/kvm/priv.c	diff1 \|	diff2 \|	blob \| history
arch/s390/kvm/vsie.c	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/cpufeatures.h	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/msr-index.h	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/cpu/amd.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/cpu/scattered.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kvm/emulate.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kvm/mmu.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kvm/svm.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kvm/vmx.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kvm/x86.c	diff1 \|	diff2 \|	blob \| history
include/kvm/arm_arch_timer.h	diff1 \|	diff2 \|	blob \| history
include/uapi/linux/kvm.h	diff1 \|	diff2 \|	blob \| history
virt/kvm/arm/arch_timer.c	diff1 \|	diff2 \|	blob \| history
virt/kvm/arm/arm.c	diff1 \|	diff2 \|	blob \| history
virt/kvm/arm/mmu.c	diff1 \|	diff2 \|	blob \| history