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).
--
Cheers,
Stephen Rothwell [email protected]
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.
*/
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 [email protected]
>
>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
Hi,
On Mon, 13 Apr 2015 14:09:13 +0800 Wei Yang <[email protected]> wrote:
>
> 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?
You should have nothing to do, Michael has fixed it up when he merged
Ben's tree into his.
--
Cheers,
Stephen Rothwell [email protected]
On Mon, Apr 13, 2015 at 05:55:31PM +1000, Stephen Rothwell wrote:
>Hi,
>
>On Mon, 13 Apr 2015 14:09:13 +0800 Wei Yang <[email protected]> wrote:
>>
>> 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?
>
>You should have nothing to do, Michael has fixed it up when he merged
>Ben's tree into his.
OK, thanks :-)
>
>--
>Cheers,
>Stephen Rothwell [email protected]
--
Richard Yang
Help you, Help me