From: Bjorn Helgaas <bhelgaas@google.com>
Date: Mon, 11 Jun 2018 13:14:42 +0000 (-0500)
Subject: Merge branch 'pci/aer-squash'
X-Git-Tag: Ubuntu-5.10.0-12.13~7627^2
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=ce4c7b241227ed49c0b6f0f1867653e1ee0007ef;p=mirror_ubuntu-hirsute-kernel.git

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
---

ce4c7b241227ed49c0b6f0f1867653e1ee0007ef