Hi Jesse, This patch set for aerdrv contains minor fixes, cleanups, and some small additional codes for optional features; enhancement of aer-inject, plus support TRACE_EVENT for error logging. Following patch is required to be applied before this set: > Author: Alexander Duyck <alexander.h.duyck@xxxxxxxxx> > Date: Thu Mar 25 13:03:30 2010 -0700 > Subject: [PATCH] aerdrv: use correct bit defines and add 2ms delay to aer_root_reset This set is based on v2.6.33 + Alexander's patch above. Confirmed that no conflict with today's pci/linux-next. Welcome your comments. Thanks, H.Seto === Hidetoshi Seto (22): aerdrv, doc: update example output in pcieaer-howto.txt aerdrv: RsvdP of PCI_ERR_ROOT_COMMAND aerdrv: cleanup inconsistent functions aerdrv: rework find_source_device aerdrv: rework find_device_iter aerdrv: rework aer_isr_one_error() aerdrv: rework get_e_source() aerdrv: rework do_recovery aerdrv: clear correctable status soon after retrieved aerdrv: redefine PCI_ERR_ROOT_*_SRC aerdrv: remove magical ROOT_ERR_STATUS_MASKS aerdrv: remove is_downstream aerdrv: rework find_aer_service aerdrv: introduce default_downstream_reset_link aerdrv: introduce get_err_handler() aerdrv: introduce set_e_source() aerdrv: trivial cleanup for aerdrv.c aerdrv: trivial cleanup for aerdrv_core.c portdrv: introduce get_port_err_handler trace, pcie, aer: use TRACE_EVENT() for PCIe AER logging trace, pcie, aer: trace_aer_irq to trace receipt of AER message aer-inject: support multiple device injection and faking fep Documentation/PCI/pcieaer-howto.txt | 30 +- drivers/pci/pcie/aer/aer_inject.c | 17 +- drivers/pci/pcie/aer/aerdrv.c | 115 ++++---- drivers/pci/pcie/aer/aerdrv.h | 6 +- drivers/pci/pcie/aer/aerdrv_core.c | 518 +++++++++++++++++------------------ drivers/pci/pcie/portdrv_pci.c | 108 ++++---- include/linux/pci_regs.h | 5 +- include/trace/events/pcie_aer.h | 93 +++++++ 8 files changed, 491 insertions(+), 401 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html