Hi all, On Mon, 21 Sep 2020 15:18:07 +1000 Stephen Rothwell <[email protected]> wrote: > > Today's linux-next merge of the usb tree got a conflict in: > > drivers/pci/controller/pcie-brcmstb.c > > between commit: > > 1cf1b0a6dd95 ("PCI: brcmstb: Add bcm7278 register info") > > from the pci tree and commit: > > f48cc509c935 ("Revert "PCI: brcmstb: Wait for Raspberry Pi's firmware when > present"") > > from the usb 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. > > diff --cc drivers/pci/controller/pcie-brcmstb.c > index 6e7aa82a54a3,bac63d04297f..000000000000 > --- a/drivers/pci/controller/pcie-brcmstb.c > +++ b/drivers/pci/controller/pcie-brcmstb.c > @@@ -1213,8 -929,6 +1211,7 @@@ static int brcm_pcie_probe(struct platf > { > struct device_node *np = pdev->dev.of_node, *msi_np; > struct pci_host_bridge *bridge; > - struct device_node *fw_np; > + const struct pcie_cfg_data *data; > struct brcm_pcie *pcie; > int ret; >
This is now a conflict between the pci tree and Linus' tree. -- Cheers, Stephen Rothwell
pgpTHoKAh_Xc4.pgp
Description: OpenPGP digital signature
