These patches are based on Linus's tree The changes are: - do not call pci_disable_device on an already disabled device. - add a new lockup condition to lockup handler. - remove coalescing settings for ioaccel2 - update driver version. --- Don Brace (4): hpsa: correct lockup detector pci_disable_device hpsa: add generate controller NMI on lockup hpsa: remove coalescing settings for ioaccel2 hpsa: bump driver version drivers/scsi/hpsa.c | 19 +++++++++++-------- drivers/scsi/hpsa_cmd.h | 1 + 2 files changed, 12 insertions(+), 8 deletions(-) -- Signature -- To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html