Please do a bk pull bk://gkernel.bkbits.net/libata-2.6 This will update the following files: drivers/scsi/ahci.c | 12 +++++------ drivers/scsi/sata_qstor.c | 50 +++++++++++++++++++++++++++++++--------------- drivers/scsi/sata_vsc.c | 4 +-- 3 files changed, 42 insertions(+), 24 deletions(-) through these ChangeSets: : o sata_qstor: eh_timeout fix : o drivers/scsi/ahci: Use the DMA_{64,32}BIT_MASK constants o drivers/scsi/sata_vsc: Use the DMA_{64,32}BIT_MASK constants Jeff Garzik: o [libata ahci] Print out port id on error messages Mark Lord: o [libata qstor] minor update per LKML comments