Changes since v3 are: Initialize port services directly from port driver (suggested by Bjorn) Updated changelogs to match local style Added documentation update for ERR_FATAL behavior Included DPC save/restore state fix that was missing from previous Included AER upstream port fix that was mistakenly added to a different patch set Keith Busch (12): PCI: portdrv: Initialize service drivers directly PCI: portdrv: Restore pci state on slot reset PCI: DPC: Save and restore control state PCI: AER: Take reference on error devices PCI: AER: Don't read upstream ports below fatal errors PCI: ERR: Use slot reset if available PCI: ERR: Handle fatal error recovery PCI: ERR: Always use the first downstream port PCI: ERR: Simplify broadcast callouts PCI: ERR: Report current recovery status for udev PCI: Unify device inaccessible PCI: Make link active reporting detection generic Documentation/PCI/pci-error-recovery.txt | 35 ++-- drivers/pci/hotplug/pciehp.h | 6 - drivers/pci/hotplug/pciehp_core.c | 3 +- drivers/pci/hotplug/pciehp_hpc.c | 22 +-- drivers/pci/pci.c | 68 +++++++- drivers/pci/pci.h | 74 ++++++++- drivers/pci/pcie/aer.c | 25 +-- drivers/pci/pcie/dpc.c | 72 ++++++-- drivers/pci/pcie/err.c | 276 ++++++++----------------------- drivers/pci/pcie/pme.c | 3 +- drivers/pci/pcie/portdrv.h | 24 +++ drivers/pci/pcie/portdrv_pci.c | 17 ++ drivers/pci/probe.c | 1 + drivers/pci/slot.c | 2 +- include/linux/pci.h | 1 + 15 files changed, 331 insertions(+), 298 deletions(-) -- 2.14.4