From: Bjorn Helgaas <bhelgaas@google.com>
Date: Thu, 20 Apr 2023 21:16:32 +0000 (-0500)
Subject: Merge branch 'pci/aer'
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=1a65a3271dad3a03eb4d34e1ff6a3ad6c3ffb761;p=linux.git

Merge branch 'pci/aer'

- Remove unnecessary <linux/aer.h> includes (Bjorn Helgaas)

- Clear Device Status after EDR error recovery.  Firmware collects EDR
  error information, but the OS is responsible for clearing it (Kuppuswamy
  Sathyanarayanan)

* pci/aer:
  PCI/EDR: Add edr_handle_event() comments
  PCI/EDR: Clear Device Status after EDR error recovery
  efi/cper: Remove unnecessary aer.h include
---

1a65a3271dad3a03eb4d34e1ff6a3ad6c3ffb761