git.itanic.dy.fi Git - linux-stable/commit

]> git.itanic.dy.fi Git - linux-stable/commit

projects / linux-stable / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: a2488c5 a96cb3b)

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 24 Apr 2024 07:54:12 +0000 (17:54 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 24 Apr 2024 07:54:12 +0000 (17:54 +1000)
commit	8bfad131ea4e46475cd698e99cec8429ffae0373
tree	881232b87d48bc7246d64c619e3607908154aa7c	tree \| snapshot
parent	a2488c51099b89a6c9d8f6832cf1d2b6ee366568	commit \| diff
parent	a96cb3bf390eebfead5fc7a2092f8452a7997d1b	commit \| diff

Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git

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

17 files changed:

arch/x86/include/asm/kvm_host.h	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/fpu/xstate.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kvm/Makefile	diff1 \|	diff2 \|	blob \| history
arch/x86/kvm/cpuid.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kvm/mmu/mmu.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kvm/mmu/tdp_mmu.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kvm/svm/sev.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kvm/svm/svm.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kvm/svm/svm.h	diff1 \|	diff2 \|	blob \| history
arch/x86/kvm/vmx/vmx.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kvm/x86.c	diff1 \|	diff2 \|	blob \| history
mm/ksm.c	diff1 \|	diff2 \|	blob \| history
mm/memory.c	diff1 \|	diff2 \|	blob \| history
mm/migrate_device.c	diff1 \|	diff2 \|	blob \| history
tools/testing/selftests/kvm/Makefile	diff1 \|	diff2 \|	blob \| history
tools/testing/selftests/kvm/set_memory_region_test.c	diff1 \|	diff2 \|	blob \| history
virt/kvm/kvm_main.c	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.