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)
commit5a213b9220e0bf4c924412d83d7c9a90acb553e8
tree812347f305cf082e8892ac34eedf51a4979c5636
parentd8f6ef45a623d650f9b97e11553adb4978f6aa70
parent63fa47ba886b86cbd58f03b3b01b04bd57a1f233
Merge branch 'topic/ppc-kvm' of https://git./linux/kernel/git/powerpc/linux into HEAD

Fix conflicts between memslot overhaul and commit 511d25d6b789f ("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