Re: linux-next: manual merge of the kvm tree with the powerpc tree
From: Michael Ellerman <mpe@ellerman.id.au>
Date: 2017-02-15 10:52:16
Also in:
kvm, linux-next, lkml
Stephen Rothwell [off-list ref] writes:
Hi all,
Today's linux-next merge of the kvm tree got a conflict in:
arch/powerpc/kvm/book3s_hv_rm_xics.c
between commit:
ab9bad0ead9a ("powerpc/powernv: Remove separate entry for OPAL real mode calls")
from the powerpc tree and commit:
21acd0e4df04 ("KVM: PPC: Book 3S: XICS: Don't lock twice when checking for resend")
from the kvm tree.Thanks. That will go away if/when Paolo merges the rest of Paul's next. cheers
quoted hunk ↗ jump to hunk
diff --cc arch/powerpc/kvm/book3s_hv_rm_xics.c index 29f43ed6d5eb,0b2e388f4cdf..000000000000--- a/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,