git.baikalelectronics.ru Git - kernel.git/commit

]> git.baikalelectronics.ru Git - kernel.git/commit

projects / kernel.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 24217ae d800295)

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	d032eba330411a67eccd427055e17b103fa9226f
tree	f98a256ff3e4b20ca6252f7f80ce17759e57c6f2	tree \| snapshot
parent	24217aeb40a678e0e3b73aa1044f87e2d1caa53f	commit \| diff
parent	d800295318a3c451cfffc681cf9a490fd8f7fca2	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

Linux Kernel Source Tree.