From: Bjorn Helgaas <bhelgaas@google.com>
Date: Mon, 13 May 2019 23:34:29 +0000 (-0500)
Subject: Merge branch 'pci/aer'
X-Git-Tag: v5.2-rc1~70^2~24
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=156752817cb090643f7e20094d17dbd2c3f14f0d;p=thirdparty%2Fkernel%2Flinux.git

Merge branch 'pci/aer'

  - Fix pci_aer_init() stub prototype for non-CONFIG_PCIEAER case (Jisheng
    Zhang)

* pci/aer:
  PCI/AER: Change pci_aer_init() stub to return void
---

156752817cb090643f7e20094d17dbd2c3f14f0d