tree e6138151a93ccd0c78681fd4c8203df44f5fc1e5
parent 3b3191df4e7cff160e2e693b7a78c2fc43634d64
parent 0b15f1e38f639a322213ebdc8b752300138edd0b
author Bjorn Helgaas <bhelgaas@google.com> 1528722882 -0500
committer Bjorn Helgaas <helgaas@kernel.org> 1528722882 -0500

Merge branch 'pci/aer-squash'

  - squash AER directory into drivers/pci/pcie/aer.c (Bjorn Helgaas)

* pci/aer-squash:
  PCI/AER: Use "PCI Express" consistently in Kconfig text
  PCI/AER: Hoist aerdrv.c, aer_inject.c up to drivers/pci/pcie/
  PCI/AER: Squash Kconfig.debug into Kconfig
  PCI/AER: Move private AER things to aerdrv.c
  PCI/AER: Move aer_irq() declaration to portdrv.h
  PCI/AER: Move pcie_aer_get_firmware_first() to portdrv.h
  PCI/AER: Remove duplicate pcie_port_bus_type declaration
  PCI/AER: Squash ecrc.c into aerdrv.c
  PCI/AER: Squash aerdrv_acpi.c into aerdrv.c
  PCI/AER: Squash aerdrv_errprint.c into aerdrv.c
  PCI/AER: Squash aerdrv_core.c into aerdrv.c
  PCI/AER: Reorder code to group probe/remove stuff together
  PCI/AER: Remove forward declarations