From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751734AbdBOCi0 (ORCPT ); Tue, 14 Feb 2017 21:38:26 -0500 Received: from ozlabs.org ([103.22.144.67]:43931 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751218AbdBOCiY (ORCPT ); Tue, 14 Feb 2017 21:38:24 -0500 Date: Wed, 15 Feb 2017 13:38:20 +1100 From: Stephen Rothwell To: Marcelo Tosatti , Gleb Natapov , KVM , Michael Ellerman , Benjamin Herrenschmidt , PowerPC Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Paul Mackerras , Li Zhong Subject: linux-next: manual merge of the kvm tree with the powerpc tree Message-ID: <20170215133820.439190c9@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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. I fixed it up (see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell 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,