Hi all, Today's linux-next merge of the pci tree got a conflict in: drivers/pci/probe.c between commit: 1d59d474e1cb ("PCI: Hold rescan lock while adding devices during host probe") from Linus' tree and commit: dc421bb3c0db ("PCI: Enable runtime PM of the host bridge") from the pci 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. -- Cheers, Stephen Rothwell diff --cc drivers/pci/probe.c index f1615805f5b0,bf4c76ec8cd4..000000000000 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@@ -3105,9 -3127,18 +3127,20 @@@ int pci_host_probe(struct pci_host_brid list_for_each_entry(child, &bus->children, node) pcie_bus_configure_settings(child); + pci_lock_rescan_remove(); pci_bus_add_devices(bus); + pci_unlock_rescan_remove(); + + /* + * Ensure pm_runtime_enable() is called for the controller drivers + * before calling pci_host_probe(). The PM framework expects that + * if the parent device supports runtime PM, it will be enabled + * before child runtime PM is enabled. + */ + pm_runtime_set_active(&bridge->dev); + pm_runtime_no_callbacks(&bridge->dev); + devm_pm_runtime_enable(&bridge->dev); + return 0; } EXPORT_SYMBOL_GPL(pci_host_probe);
Attachment:
pgpx0_jL7KPSf.pgp
Description: OpenPGP digital signature