Merge branch 'pci/aer' into next
authorBjorn Helgaas <bhelgaas@google.com>
Wed, 31 Jan 2018 16:10:25 +0000 (10:10 -0600)
committerBjorn Helgaas <helgaas@kernel.org>
Wed, 31 Jan 2018 16:10:25 +0000 (10:10 -0600)
* pci/aer:
  PCI/AER: Return error if AER is not supported
  PCI/AER: Skip recovery callbacks for correctable errors from ACPI APEI


Trivial merge