commit c3900329b53f7a1df38ccc9cb8c8969138114d30
author Bjorn Helgaas <bhelgaas@google.com> Wed Feb 24 14:59:18 2021 -0600
committer Bjorn Helgaas <bhelgaas@google.com> Wed Feb 24 14:59:18 2021 -0600
tree f972bf5cc1adda093d21a42aa6365f33439db888
parent ce3e292eb703eb2bbe2708f9a59c3947aa99742e
parent ba952824e6c106f979c07814c8e3ef7405dd7b29

Merge branch 'pci/error'

- Clear AER status of the reporting device (Keith Busch)

- Clear AER status from Root Port when resetting Downstream Port (Keith
  Busch)

- Retain status from error notification (Keith Busch)

- Log the type of Port that was reset for error handling (Keith Busch)

- Report reset for frozen channel (Keith Busch)

* pci/error:
  PCI/portdrv: Report reset for frozen channel
  PCI/AER: Specify the type of Port that was reset
  PCI/ERR: Retain status from error notification
  PCI/AER: Clear AER status from Root Port when resetting Downstream Port
  PCI/ERR: Clear status of the reporting device