linux-next: manual merge of the tip tree with the pci tree

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the tip tree got a conflict in
drivers/pci/host/pcie-rcar.c between commit 3c70637f7569 ("PCI: rcar:
Make rcar_pci static") from the pci tree and commit 7c35c8cc32f3 ("PCI:
rcar: Save MSI controller in pci_sys_data") from the tip tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    s...@canb.auug.org.au

diff --cc drivers/pci/host/pcie-rcar.c
index 0df9b2941221,c1177cd55ce3..000000000000
--- a/drivers/pci/host/pcie-rcar.c
+++ b/drivers/pci/host/pcie-rcar.c
@@@ -380,16 -380,7 +380,7 @@@ static int rcar_pcie_setup(int nr, stru
        return 1;
  }
  
- static void rcar_pcie_add_bus(struct pci_bus *bus)
- {
-       if (IS_ENABLED(CONFIG_PCI_MSI)) {
-               struct rcar_pcie *pcie = sys_to_pcie(bus->sysdata);
- 
-               bus->msi = &pcie->msi.chip;
-       }
- }
- 
 -struct hw_pci rcar_pci = {
 +static struct hw_pci rcar_pci = {
        .setup          = rcar_pcie_setup,
        .map_irq        = of_irq_parse_and_map_pci,
        .ops            = &rcar_pcie_ops,

pgpiIWOZQWOMG.pgp
Description: OpenPGP digital signature