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

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

summary | shortlog | log | commit | commitdiff | tree
(merge: 5dc4c99 9f1a4c0)

author	Oliver Upton <oliver.upton@linux.dev>
	Mon, 13 Feb 2023 22:28:30 +0000 (22:28 +0000)
committer	Oliver Upton <oliver.upton@linux.dev>
	Mon, 13 Feb 2023 22:28:34 +0000 (22:28 +0000)
commit	92425e058ab6ab1a4c4a9d384d2d86b810f57e23
tree	612588ba735977d3f5e73c4f7af72769f24bd059	tree \| snapshot
parent	5dc4c995db9eb45f6373a956eb1f69460e69e6d4	commit \| diff
parent	9f1a4c004869d3c8061f286fec4d8096dd099b84	commit \| diff

Merge branch kvm/kvm-hw-enable-refactor into kvmarm/next

Merge the kvm_init() + hardware enable rework to avoid conflicts
with kvmarm.

Signed-off-by: Oliver Upton <oliver.upton@linux.dev>

Documentation/virt/kvm/locking.rst	diff1 \|	diff2 \|	blob \| history
arch/arm64/kvm/mmu.c	diff1 \|	diff2 \|	blob \| history
arch/arm64/kvm/sys_regs.c	diff1 \|	diff2 \|	blob \| history
arch/s390/kvm/interrupt.c	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/kvm_host.h	diff1 \|	diff2 \|	blob \| history
arch/x86/kvm/cpuid.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kvm/svm/nested.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kvm/xen.c	diff1 \|	diff2 \|	blob \| history
virt/kvm/kvm_main.c	diff1 \|	diff2 \|	blob \| history

Domain: System / Kernel;