From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 28 Jun 2025 03:17:48 +0000 (-0700)
Subject: Merge tag 'pci-v6.16-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci
X-Git-Tag: v6.16-rc4~13
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fa33adcaf8af147f4238c84d76a316a47e43e091;p=thirdparty%2Fkernel%2Flinux.git

Merge tag 'pci-v6.16-fixes-2' of git://git.kernel.org/pub/scm/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
---

fa33adcaf8af147f4238c84d76a316a47e43e091