Received-SPF: pass (google.com: domain of linux-kernel+bounces-198499-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3;
Date: Mon, 3 Jun 2024 10:24:09 +1000
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Bjorn Helgaas <bhelgaas@google.com>, Lorenzo Pieralisi
 <lpieralisi@kernel.org>, Krzysztof =?UTF-8?B?V2lsY3p5xYRza2k=?=
 <kw@linux.com>
Cc: Dan Williams <dan.j.williams@intel.com>, Linux Kernel Mailing List
 <linux-kernel@vger.kernel.org>, Linux Next Mailing List
 <linux-next@vger.kernel.org>
Subject: linux-next: manual merge of the pci tree with the pci-current tree
Message-ID: <20240603102335.79926f54@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/2S78U.EVaT4vkiTNtNC8Uqb";
 protocol="application/pgp-signature"; micalg=pgp-sha256

--Sig_/2S78U.EVaT4vkiTNtNC8Uqb
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

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.

--=20
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);
 =20
  	return pci_bridge_wait_for_secondary_bus(dev, "bus reset");

--Sig_/2S78U.EVaT4vkiTNtNC8Uqb
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmZdDSoACgkQAVBC80lX
0Gz7rQgAlA4LEVI6h7Nqu9He2WnsU7DgaAv0kE/JB1sXYYqGLPh3ThWDrT2PHX+Q
BfH7M5BIk1M/qjcS5HZA4KsUcCFgsU8Q+SALcfjW6hz5eEK+Tu/DDtr2ZBINFGKm
4GazoFwpaFWYI0G5QsPiQyPFxUKbSo+qzC095FWAa1rGhdPp0wZ9+HNx7yeD7hI0
QosYXAPhlRP3NtUYHxfY3dcXN46aOnT1ED8391TvbsUIHPpsdEnhEOqPJvpl2JnL
J95iiXW7puxKiuQp4xWVmf+EaxJ85Wr6e4/IsJWyhEBxDUZODnituaOr4upigi24
3TEBFFBU6khgB9jkRn+FLSqO7Nqi8A==
=+YZ8
-----END PGP SIGNATURE-----

--Sig_/2S78U.EVaT4vkiTNtNC8Uqb--