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

projects / linux-2.6-block.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 3498e16 4dfc4ec)

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Tue, 1 Mar 2022 04:20:25 +0000 (15:20 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Tue, 1 Mar 2022 04:20:25 +0000 (15:20 +1100)
commit	61aae906956d19c7d2d4d16663214eca853194ff
tree	a34abdc4699160284563fb7095295b78ff2c2551	tree
parent	3498e162e34aab021917e6ea170d2692b8045a30	commit \| diff
parent	4dfc4ec2b7f5a3a27d166ac42cf8a583fa2d3284	commit \| diff

Merge branch 'next' of git://git./virt/kvm/kvm.git

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

16 files changed:

Documentation/admin-guide/kernel-parameters.txt	diff1 \|	diff2 \|	blob \| history
Documentation/virt/kvm/api.rst	diff1 \|	diff2 \|	blob \| history
MAINTAINERS	diff1 \|	diff2 \|	blob \| history
arch/s390/include/asm/uaccess.h	diff1 \|	diff2 \|	blob \| history
arch/s390/kvm/kvm-s390.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/emulate.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kvm/mmu/mmu.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kvm/svm/svm.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kvm/vmx/nested.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kvm/vmx/pmu_intel.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kvm/vmx/vmx.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kvm/x86.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kvm/x86.h	diff1 \|	diff2 \|	blob \| history
virt/kvm/kvm_main.c	diff1 \|	diff2 \|	blob \| history

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