From: Bjorn Helgaas <bhelgaas@google.com>
Date: Tue, 6 Jul 2021 15:56:22 +0000 (-0500)
Subject: Merge branch 'pci/error'
X-Git-Tag: irq-urgent-2021-07-11~4^2~23
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=5f2554cc0ae202db743dc1155e55b7111409e822;p=users%2Fdwmw2%2Flinux.git

Merge branch 'pci/error'

- Make domain/bus/dev/fn format in AER messages match pci_name() format
  (Yicong Yang)

* pci/error:
  Documentation: PCI: Fix typo in pci-error-recovery.rst
  PCI/AER: Use consistent format when printing PCI device
---

5f2554cc0ae202db743dc1155e55b7111409e822