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)
commit86e99150c3ce4726d4f15c64f535b903a66fa76f
treea0f3467479cf517bf6fca9d2cba138d8bb8769c7
parent1291a0d5049dbc06baaaf66a9ff3f53db493b19b
parent0f6f1d9fca4ad91ce9b30dc0aa847b0947786261
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