Merge tag 'kvm-ppc-next-4.18-2' of git://git.kernel.org/pub/scm/linux/kernel/git...

diff --cc arch/powerpc/include/asm/asm-prototypes.h
Simple merge

diff --cc arch/powerpc/kernel/asm-offsets.c
Simple merge

diff --cc arch/powerpc/kvm/book3s_64_mmu_hv.c
Simple merge

diff --cc arch/powerpc/kvm/book3s_hv.c
Simple merge

diff --cc arch/powerpc/kvm/book3s_hv_rmhandlers.S
Simple merge

diff --cc arch/powerpc/kvm/powerpc.c
Simple merge