From: Stephen Rothwell <sfr@canb•auug.org.au>
To: "Bjorn Helgaas" <bhelgaas@google•com>,
"Lorenzo Pieralisi" <lpieralisi@kernel•org>,
"Krzysztof Wilczyński" <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
Date: Mon, 3 Jun 2024 10:24:09 +1000 [thread overview]
Message-ID: <20240603102335.79926f54@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1315 bytes --]
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");
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2024-06-03 0:24 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-03 0:24 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2026-01-05 0:55 linux-next: manual merge of the pci tree with the pci-current tree Stephen Rothwell
2024-10-24 0:25 Stephen Rothwell
2024-10-24 6:56 ` Bartosz Golaszewski
2024-10-24 18:50 ` Bjorn Helgaas
2018-08-01 0:42 Stephen Rothwell
2016-02-24 0:02 Stephen Rothwell
2014-03-12 13:00 Mark Brown
2010-03-26 0:57 Stephen Rothwell
2010-03-26 2:10 ` Jesse Barnes
2010-03-26 2:48 ` Stephen Rothwell
2010-03-26 16:03 ` Jesse Barnes
2010-03-26 14:43 ` Bjorn Helgaas
2009-02-06 2:50 Stephen Rothwell
2009-02-06 17:09 ` Jesse Barnes
2009-02-06 23:49 ` Rafael J. Wysocki
2009-02-07 0:07 ` Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240603102335.79926f54@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=bhelgaas@google$(echo .)com \
--cc=dan.j.williams@intel$(echo .)com \
--cc=kw@linux$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=lpieralisi@kernel$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox