Subject: linux-next: manual merge of the pci tree with the pci-current tree

From: Stephen Rothwell <[email-masked]>
Date: Mon, 3 Jun 2024 10:24:09 +1000

Hi all,

Today's linux-next merge of the pci tree got a conflict in:

  drivers/pci/pci.c

between commit:

  e6d1cd96b33c ("PCI: Revert the cfg_access_lock lockdep mechanism")

from the pci-current tree and commit:

  0d1a1c6745a8 ("PCI: Warn on missing cfg_access_lock during secondary bus reset")

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/pci.c
index 35fb1f17a589,d2c388761ba9..000000000000
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@@ -4883,6 -4883,10 +4883,9 @@@ void __weak pcibios_reset_secondary_bus
   */
  int pci_bridge_secondary_bus_reset(struct pci_dev *dev)
  {
 -	lock_map_assert_held(&dev->cfg_access_lock);
+ 	if (!dev->block_cfg_access)
+ 		pci_warn_once(dev, "unlocked secondary bus reset via: %pS\n",
+ 			      __builtin_return_address(0));
  	pcibios_reset_secondary_bus(dev);
  
  	return pci_bridge_wait_for_secondary_bus(dev, "bus reset");