]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'topic/ppc-kvm' of https://git.kernel.org/pub/scm/linux/kernel/git/power...
authorPaolo Bonzini <pbonzini@redhat.com>
Sun, 19 Dec 2021 14:27:21 +0000 (15:27 +0100)
committerPaolo Bonzini <pbonzini@redhat.com>
Sun, 19 Dec 2021 14:27:21 +0000 (15:27 +0100)
commitacb8f282f043040d3ccc0577585ef1892304459f
tree812347f305cf082e8892ac34eedf51a4979c5636
parent0dce8fe980a517cbc5f90d1ef21ab46d6d29afda
parentc6087cb749edd17400d55584b3055b6a478b9b21
Merge branch 'topic/ppc-kvm' of https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux into HEAD

Fix conflicts between memslot overhaul and commit cb18db8c1bc3e ("KVM:
PPC: Book3S: Suppress warnings when allocating too big memory slots")
from the powerpc tree.
arch/powerpc/include/asm/kvm_host.h
arch/powerpc/include/asm/kvm_ppc.h
arch/powerpc/kvm/Kconfig
arch/powerpc/kvm/book3s_hv.c
arch/powerpc/kvm/book3s_hv_nested.c