From: Bjorn Helgaas <bhelgaas@google.com>
Date: Fri, 3 Oct 2025 17:13:23 +0000 (-0500)
Subject: Merge branch 'pci/controller/tegra'
X-Git-Tag: v6.18-rc1~60^2~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c4c50d8da88c383cc446e60fda8c2c317ebb93e5;p=thirdparty%2Fkernel%2Fstable.git

Merge branch 'pci/controller/tegra'

- Correct the devm_kcalloc() argument order (Alok Tiwari)

- When asserting PERST#, disable the controller instead of mistakenly
  disabling the PLL twice (Nagarjuna Kristam)

- Convert struct tegra_msi mask_lock to raw spinlock to avoid a lock
  nesting error (Marek Vasut)

- Rename 'root_bus' to 'root_port_bus' for clarity (Manivannan Sadhasivam)

* pci/controller/tegra:
  PCI: tegra194: Rename 'root_bus' to 'root_port_bus' in tegra_pcie_downstream_dev_to_D0()
  PCI: tegra: Convert struct tegra_msi mask_lock into raw spinlock
  PCI: tegra194: Fix duplicate PLL disable in pex_ep_event_pex_rst_assert()
  PCI: tegra: Fix devm_kcalloc() argument order for port->phys allocation
---

c4c50d8da88c383cc446e60fda8c2c317ebb93e5