From: Bjorn Helgaas <bhelgaas@google.com>
Date: Tue, 4 May 2021 15:43:22 +0000 (-0500)
Subject: Merge branch 'pci/enumeration'
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=975af39978f9e4eaeca0a3b0940632cceebe21a4;p=linux.git

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
---

975af39978f9e4eaeca0a3b0940632cceebe21a4