• B
    Merge branch 'pci/aer' into next · 4dc2db09
    Bjorn Helgaas 提交于
    * 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
    4dc2db09
pci.h 74.3 KB