From: Wei Yang <weiyang@linux.vnet.ibm.com> To: Stephen Rothwell <sfr@canb.auug.org.au> Cc: Michael Ellerman <mpe@ellerman.id.au>, Benjamin Herrenschmidt <benh@kernel.crashing.org>, linuxppc-dev@lists.ozlabs.org, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Daniel Axtens <dja@axtens.net>, Wei Yang <weiyang@linux.vnet.ibm.com> Subject: Re: linux-next: manual merge of the powerpc-mpe tree with the powerpc tree Date: Mon, 13 Apr 2015 14:09:13 +0800 [thread overview] Message-ID: <20150413060913.GA2365@richard> (raw) In-Reply-To: <20150413132715.2303253f@canb.auug.org.au> 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
WARNING: multiple messages have this Message-ID (diff)
From: Wei Yang <weiyang@linux.vnet.ibm.com> To: Stephen Rothwell <sfr@canb.auug.org.au> Cc: Wei Yang <weiyang@linux.vnet.ibm.com>, linux-kernel@vger.kernel.org, linux-next@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, Daniel Axtens <dja@axtens.net> Subject: Re: linux-next: manual merge of the powerpc-mpe tree with the powerpc tree Date: Mon, 13 Apr 2015 14:09:13 +0800 [thread overview] Message-ID: <20150413060913.GA2365@richard> (raw) In-Reply-To: <20150413132715.2303253f@canb.auug.org.au> 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
next prev parent reply other threads:[~2015-04-13 6:10 UTC|newest] Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top 2015-04-13 3:27 linux-next: manual merge of the powerpc-mpe tree with the powerpc tree Stephen Rothwell 2015-04-13 3:27 ` Stephen Rothwell 2015-04-13 3:27 ` Stephen Rothwell 2015-04-13 6:09 ` Wei Yang [this message] 2015-04-13 6:09 ` Wei Yang 2015-04-13 7:55 ` Stephen Rothwell 2015-04-13 7:55 ` Stephen Rothwell 2015-04-13 8:47 ` Wei Yang 2015-04-13 8:47 ` Wei Yang 2015-04-13 3:30 Stephen Rothwell 2015-04-13 3:30 ` Stephen Rothwell 2015-04-13 3:30 ` Stephen Rothwell
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20150413060913.GA2365@richard \ --to=weiyang@linux.vnet.ibm.com \ --cc=benh@kernel.crashing.org \ --cc=dja@axtens.net \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-next@vger.kernel.org \ --cc=linuxppc-dev@lists.ozlabs.org \ --cc=mpe@ellerman.id.au \ --cc=sfr@canb.auug.org.au \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.