From: Bjorn Helgaas <bhelgaas@google.com>
Date: Wed, 5 Aug 2020 23:24:15 +0000 (-0500)
Subject: Merge branch 'pci/error'
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=b0735e8d2c360b7b1343f299fb22df39f2a7797e;p=linux.git

Merge branch 'pci/error'

- Use pci_channel_state_t instead of enum pci_channel_state (Luc Van
  Oostenryck)

- Simplify __aer_print_error() (Bjorn Helgaas)

- Log AER correctable errors as warning, not error (Matt Jolly)

- Rename pci_aer_clear_device_status() to pcie_clear_device_status() (Bjorn
  Helgaas)

- Clear PCIe Device Status errors only if OS owns AER (Jonathan Cameron)

* pci/error:
  PCI/ERR: Clear PCIe Device Status errors only if OS owns AER
  PCI/ERR: Rename pci_aer_clear_device_status() to pcie_clear_device_status()
  PCI/AER: Log correctable errors as warning, not error
  PCI/AER: Simplify __aer_print_error()
  PCI: Use 'pci_channel_state_t' instead of 'enum pci_channel_state'
---

b0735e8d2c360b7b1343f299fb22df39f2a7797e