Merge branch 'pci/aer' into next

* pci/aer:
  PCI/AER: Fix aer_probe() kernel-doc comment
  PCI/AER: Cache capability position
  PCI/AER: Avoid memory allocation in interrupt handling path
  ACPI / APEI: Send correct severity to calculate AER severity
  PCI/AER: Remove duplicate AER severity translation
  PCI/AER: Remove aerdriver.forceload kernel parameter
  PCI/AER: Remove aerdriver.nosourceid kernel parameter
  x86/PCI: VMD: Add quirk for AER to ignore source ID
  PCI/AER: Add bus flag to skip source ID matching

Conflicts:
	drivers/pci/probe.c

diff --cc drivers/pci/pcie/aer/aerdrv.c
Simple merge

diff --cc drivers/pci/probe.c
index e2e4244720588e462860c00f38c6ac74c2ff549b,1575724205136dfcacc8326ab50a87257cc8ab44..ab002671fa60e14b83568a24d2cf504687f391f9
--- 1/drivers/pci/probe.c
--- 2/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@@ -1666,10 -1666,8 +1666,11 @@@ static void pci_init_capabilities(struc
        /* Enable ACS P2P upstream forwarding */
        pci_enable_acs(dev);
  
-       pci_cleanup_aer_error_status_regs(dev);
- 
 +      /* Precision Time Measurement */
 +      pci_ptm_init(dev);
++
+       /* Advanced Error Reporting */
+       pci_aer_init(dev);
  }
  
  /*

diff --cc include/linux/pci.h
Simple merge