Merge tag 'pci-v6.16-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 28 Jun 2025 03:17:48 +0000 (20:17 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 28 Jun 2025 03:17:48 +0000 (20:17 -0700)
commitfa33adcaf8af147f4238c84d76a316a47e43e091
treeb8d7a7bfce193377b556eab1a4a77736f3b69350
parent7abdafd2343ab199367c8243d6a5f06a9aa6976b
parent5aa326a6a2ff0a7e7c6e11777045e66704c2d5e4
Merge tag 'pci-v6.16-fixes-2' of git://git./linux/kernel/git/pci/pci

Pull PCI fix from Bjorn Helgaas:

 - Fix a PTM debugfs build error with CONFIG_DEBUG_FS=n &&
   CONFIG_PCIE_PTM=y (Manivannan Sadhasivam)

* tag 'pci-v6.16-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci:
  PCI/PTM: Build debugfs code only if CONFIG_DEBUG_FS is enabled