Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752817AbbDMGKO (ORCPT ); Mon, 13 Apr 2015 02:10:14 -0400 Received: from e23smtp09.au.ibm.com ([202.81.31.142]:35497 "EHLO e23smtp09.au.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751227AbbDMGKJ (ORCPT ); Mon, 13 Apr 2015 02:10:09 -0400 Date: Mon, 13 Apr 2015 14:09:13 +0800 From: Wei Yang To: Stephen Rothwell Cc: Michael Ellerman , Benjamin Herrenschmidt , linuxppc-dev@lists.ozlabs.org, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Daniel Axtens , Wei Yang Subject: Re: linux-next: manual merge of the powerpc-mpe tree with the powerpc tree Message-ID: <20150413060913.GA2365@richard> Reply-To: Wei Yang References: <20150413132715.2303253f@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20150413132715.2303253f@canb.auug.org.au> User-Agent: Mutt/1.5.21 (2010-09-15) X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 15041306-0033-0000-0000-00000150B992 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1931 Lines: 60 On Mon, Apr 13, 2015 at 01:27:15PM +1000, Stephen Rothwell wrote: >Hi all, > >Today's linux-next merge of the powerpc-mpe tree got a conflict in >arch/powerpc/include/asm/machdep.h between commit 6e628c7d33d9 >("powerpc/powernv: Reserve additional space for IOV BAR according to >the number of total_pe") from the tree and commit 467efc2e4fdc >("powerpc: Remove shims for pci_controller_ops operations") from the >powerpc-mpe tree. > >I fixed it up (see below) and can carry the fix as necessary (no action >is required). Hi, Stephen, Thanks for your finding :-) Your fix looks good to me. Michael & Ben, Do I need to rebase the patch or what should I do? > >-- >Cheers, >Stephen Rothwell sfr@canb.auug.org.au > >diff --cc arch/powerpc/include/asm/machdep.h >index 1b268044f290,5c19ac527a8e..000000000000 >--- a/arch/powerpc/include/asm/machdep.h >+++ b/arch/powerpc/include/asm/machdep.h >@@@ -240,21 -236,6 +236,11 @@@ struct machdep_calls > /* Called after scan and before resource survey */ > void (*pcibios_fixup_phb)(struct pci_controller *hose); > >- /* Called during PCI resource reassignment */ >- resource_size_t (*pcibios_window_alignment)(struct pci_bus *, unsigned long type); >- >- /* Reset the secondary bus of bridge */ >- void (*pcibios_reset_secondary_bus)(struct pci_dev *dev); >- > +#ifdef CONFIG_PCI_IOV > + void (*pcibios_fixup_sriov)(struct pci_dev *pdev); > + resource_size_t (*pcibios_iov_resource_alignment)(struct pci_dev *, int resno); > +#endif /* CONFIG_PCI_IOV */ > + > /* Called to shutdown machine specific hardware not already controlled > * by other drivers. > */ -- Richard Yang Help you, Help me -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/