Merge remote-tracking branch 'remotes/powerpc/topic/ppc-kvm' into kvm-ppc-next

This merges in a fix which touches both PPC and KVM code,
which was therefore put into a topic branch in the powerpc
tree.

Signed-off-by: Paul Mackerras <paulus@ozlabs.org>

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

diff --cc arch/powerpc/kvm/book3s_hv_rm_xics.c
index 0b2e388,29f43ed..e78542d
--- 1/arch/powerpc/kvm/book3s_hv_rm_xics.c
--- 2/arch/powerpc/kvm/book3s_hv_rm_xics.c
+++ b/arch/powerpc/kvm/book3s_hv_rm_xics.c
@@@ -35,8 -35,8 +35,8 @@@ int kvm_irq_bypass = 1
  EXPORT_SYMBOL(kvm_irq_bypass);
  
  static void icp_rm_deliver_irq(struct kvmppc_xics *xics, struct kvmppc_icp *icp,
 -                          u32 new_irq);
 +                          u32 new_irq, bool check_resend);
- static int xics_opal_rm_set_server(unsigned int hw_irq, int server_cpu);
+ static int xics_opal_set_server(unsigned int hw_irq, int server_cpu);
  
  /* -- ICS routines -- */
  static void ics_rm_check_resend(struct kvmppc_xics *xics,