]> www.infradead.org Git - users/hch/xfs.git/commitdiff
Merge tag 'pci-v6.10-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 6 Jun 2024 21:28:11 +0000 (14:28 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 6 Jun 2024 21:28:11 +0000 (14:28 -0700)
Pull pci fix from Bjorn Helgaas:

 - Revert lockdep checking on locking that protects device resets from
   user-space config accesses; it exposed issues for which fixes are in
   the works but are too risky for this cycle (Dan Williams)

* tag 'pci-v6.10-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci:
  PCI: Revert the cfg_access_lock lockdep mechanism


Trivial merge