review.tizen.org Git - platform/kernel/linux-starfive.git/commit

projects / platform / kernel / linux-starfive.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 14edff8 b07a5c5)

author	Paolo Bonzini <pbonzini@redhat.com>
	Thu, 21 Nov 2019 09:01:51 +0000 (10:01 +0100)
committer	Paolo Bonzini <pbonzini@redhat.com>
	Thu, 21 Nov 2019 11:03:40 +0000 (12:03 +0100)
commit	46f4f0aabc61bfd365e1eb3c8a6d766d1a49cf32
tree	f98a256ff3e4b20ca6252f7f80ce17759e57c6f2	tree \| snapshot
parent	14edff88315add29099fd8eebb9ef989c2e47c18	commit \| diff
parent	b07a5c53d42a8c87b208614129e947dd2338ff9c	commit \| diff

Merge branch 'kvm-tsx-ctrl' into HEAD

Conflicts:
arch/x86/kvm/vmx/vmx.c

16 files changed:

Documentation/admin-guide/kernel-parameters.txt	diff1 \|	diff2 \|	blob \| history
arch/arm64/kernel/cpu_errata.c	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/kvm_host.h	diff1 \|	diff2 \|	blob \| history
arch/x86/kvm/lapic.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kvm/lapic.h	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/nested.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kvm/vmx/nested.h	diff1 \|	diff2 \|	blob \| history
arch/x86/kvm/vmx/vmx.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kvm/vmx/vmx.h	diff1 \|	diff2 \|	blob \| history
arch/x86/kvm/x86.c	diff1 \|	diff2 \|	blob \| history
include/linux/kvm_host.h	diff1 \|	diff2 \|	blob \| history
include/linux/perf_event.h	diff1 \|	diff2 \|	blob \| history
kernel/events/core.c	diff1 \|	diff2 \|	blob \| history
virt/kvm/kvm_main.c	diff1 \|	diff2 \|	blob \| history

Domain: System / Kernel;