Merge remote-tracking branch 'kvm-ppc/kvm-ppc-next'

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

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

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

diff --cc arch/powerpc/kvm/trace.h
Simple merge

diff --cc arch/powerpc/sysdev/fsl_msi.c
index 51ffafae561ea5a4a12da1f401c76da164811fff,7e2b2f2e3ecde13f9e95c88801297d09c49a2583..63c5f04ea580177649aba38d101cb3f86b40cb35
--- 1/arch/powerpc/sysdev/fsl_msi.c
--- 2/arch/powerpc/sysdev/fsl_msi.c
+++ b/arch/powerpc/sysdev/fsl_msi.c
@@@ -506,12 -509,14 +509,14 @@@ static const struct of_device_id fsl_of
        },
        {
                .compatible = "fsl,ipic-msi",
 -              .data = (void *)&ipic_msi_feature,
 +              .data = &ipic_msi_feature,
        },
+ #ifdef CONFIG_EPAPR_PARAVIRT
        {
                .compatible = "fsl,vmpic-msi",
 -              .data = (void *)&vmpic_msi_feature,
 +              .data = &vmpic_msi_feature,
        },
+ #endif
        {}
  };
  

diff --cc drivers/tty/Kconfig
Simple merge

diff --cc include/linux/kvm_host.h
Simple merge