From: Bjorn Helgaas <bhelgaas@google.com>
Date: Wed, 31 Jan 2018 16:10:25 +0000 (-0600)
Subject: Merge branch 'pci/aer' into next
X-Git-Tag: pci-v4.16-changes~21
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=86e99150c3ce4726d4f15c64f535b903a66fa76f;p=users%2Fdwmw2%2Flinux.git

Merge branch 'pci/aer' into next

* pci/aer:
  PCI/AER: Return error if AER is not supported
  PCI/AER: Skip recovery callbacks for correctable errors from ACPI APEI
---

86e99150c3ce4726d4f15c64f535b903a66fa76f