Merge branch 'pci/aer' into next
authorBjorn Helgaas <bhelgaas@google.com>
Mon, 3 Oct 2016 14:42:57 +0000 (09:42 -0500)
committerBjorn Helgaas <bhelgaas@google.com>
Mon, 3 Oct 2016 14:42:57 +0000 (09:42 -0500)
commit4dc2db096a9f7c0316bafc18ee00d89e0acf4ebf
tree99563a111f0f5c0b2d8e90acfe840c7db1d0c603
parent9e18ad98ca71ca0cfcadf633547409829773f36a
parent6b20f728549030056402d7f68ea670eea1eb8198
Merge branch 'pci/aer' into next

* pci/aer:
  PCI/AER: Fix aer_probe() kernel-doc comment
  PCI/AER: Cache capability position
  PCI/AER: Avoid memory allocation in interrupt handling path
  ACPI / APEI: Send correct severity to calculate AER severity
  PCI/AER: Remove duplicate AER severity translation
  PCI/AER: Remove aerdriver.forceload kernel parameter
  PCI/AER: Remove aerdriver.nosourceid kernel parameter
  x86/PCI: VMD: Add quirk for AER to ignore source ID
  PCI/AER: Add bus flag to skip source ID matching

Conflicts:
drivers/pci/probe.c
drivers/pci/pcie/aer/aerdrv.c
drivers/pci/probe.c
include/linux/pci.h