Merge branch 'pci/error'
authorBjorn Helgaas <bhelgaas@google.com>
Thu, 4 Jun 2020 17:59:09 +0000 (12:59 -0500)
committerBjorn Helgaas <bhelgaas@google.com>
Thu, 4 Jun 2020 17:59:09 +0000 (12:59 -0500)
commit8810a9c4f15ca33a2c3fc2a89653d03b294b0a85
treead8a7c091e547bd5deaf984a619ebedd17316e60
parent8ab064e93103592bb38f8e77d52e15561df619ec
parent9103aaf9b40c4c4e51c2a4631d221daeb7d12bad
Merge branch 'pci/error'

  - Log only ACPI_NOTIFY_DISCONNECT_RECOVER events for EDR, not all ACPI
    SYSTEM-level events (Kuppuswamy Sathyanarayanan)

  - Rely only on _OSC (not _OSC + HEST FIRMWARE_FIRST) to negotiate AER
    Capability ownership (Alexandru Gagniuc)

  - Remove HEST/FIRMWARE_FIRST parsing that was previously used to help
    intuit AER Capability ownership (Kuppuswamy Sathyanarayanan)

  - Remove redundant pci_is_pcie() and dev->aer_cap checks (Kuppuswamy
    Sathyanarayanan)

  - Print IRQ number used by DPC (Yicong Yang)

* pci/error:
  PCI/DPC: Print IRQ number used by port
  PCI/AER: Use "aer" variable for capability offset
  PCI/AER: Remove redundant dev->aer_cap checks
  PCI/AER: Remove redundant pci_is_pcie() checks
  PCI/AER: Remove HEST/FIRMWARE_FIRST parsing for AER ownership
  PCI/AER: Use only _OSC to determine AER ownership
  PCI/EDR: Log only ACPI_NOTIFY_DISCONNECT_RECOVER events
include/linux/pci.h