diff options
| author |   Bjorn Helgaas <bhelgaas@google.com> | 2021-05-04 10:43:22 -0500 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2021-05-04 10:43:22 -0500 |
| commit | 975af39978f9e4eaeca0a3b0940632cceebe21a4 (patch) | |
| tree | 156fc86b7d7f75271356e14dab4520069a10a2e2 /include/uapi/linux/can/git:/ssh:/git@git.zx2c4.com | |
| parent | Linux 5.12-rc2 (diff) | |
| parent | ARM: iop32x: disable N2100 PCI parity reporting (diff) | |
| download | linux-dev-975af39978f9e4eaeca0a3b0940632cceebe21a4.tar.xz linux-dev-975af39978f9e4eaeca0a3b0940632cceebe21a4.zip | |
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
Diffstat (limited to 'include/uapi/linux/can/git:/ssh:/git@git.zx2c4.com')
0 files changed, 0 insertions, 0 deletions