From: Bjorn Helgaas <bhelgaas@google.com>
Date: Mon, 3 Oct 2016 14:42:57 +0000 (-0500)
Subject: Merge branch 'pci/aer' into next
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=4dc2db096a9f7c0316bafc18ee00d89e0acf4ebf;p=linux-beck.git

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

4dc2db096a9f7c0316bafc18ee00d89e0acf4ebf
diff --cc drivers/pci/probe.c
index e2e424472058,157572420513..ab002671fa60
--- a/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);
  }
  
  /*