Merge branch 'pci/enumeration'
authorBjorn Helgaas <bhelgaas@google.com>
Tue, 4 May 2021 15:43:22 +0000 (10:43 -0500)
committerBjorn Helgaas <bhelgaas@google.com>
Tue, 4 May 2021 15:43:22 +0000 (10:43 -0500)
commit975af39978f9e4eaeca0a3b0940632cceebe21a4
tree156fc86b7d7f75271356e14dab4520069a10a2e2
parenta38fd8748464831584a19438cbb3082b5a2dab15
parent0a0b5f4b43671f8f128eb438edacee0a1d113385
Merge branch 'pci/enumeration'

- Release OF node when pci_scan_device() fails (Dmitry Baryshkov)

- Add pci_disable_parity() (Bjorn Helgaas)

- Disable Mellanox Tavor parity reporting (Heiner Kallweit)

- Disable N2100 r8169 parity reporting (Heiner Kallweit)

* pci/enumeration:
  ARM: iop32x: disable N2100 PCI parity reporting
  IB/mthca: Disable parity reporting
  PCI: Add pci_disable_parity()
  PCI: Release OF node in pci_scan_device()'s error path