Please do a bk pull bk://kernel.bkbits.net/jgarzik/libata-upstream-2.4 This will update the following files: Documentation/Configure.help | 5 drivers/scsi/Config.in | 1 drivers/scsi/Makefile | 1 drivers/scsi/ahci.c | 26 + drivers/scsi/ata_piix.c | 4 drivers/scsi/libata-core.c | 120 ++++++- drivers/scsi/libata-scsi.c | 1 drivers/scsi/libata.h | 1 drivers/scsi/sata_nv.c | 10 drivers/scsi/sata_promise.c | 10 drivers/scsi/sata_qstor.c | 699 ++++++++++++++++++++++++++++++++++++++++++ drivers/scsi/sata_sil.c | 10 drivers/scsi/sata_sis.c | 10 drivers/scsi/sata_svw.c | 10 drivers/scsi/sata_sx4.c | 14 drivers/scsi/sata_uli.c | 10 drivers/scsi/sata_via.c | 213 +++++++++--- drivers/scsi/sata_vsc.c | 12 include/linux/libata-compat.h | 22 + include/linux/libata.h | 64 --- 20 files changed, 1079 insertions(+), 164 deletions(-) through these ChangeSets: : o [libata] add ->bmdma_{stop,status} hooks Jeff Garzik: o [libata ahci] Print out port id on error messages o [libata] Use DMA_{32,64}BIT_MASK in ahci, sata_vsc drivers o [libata] Add missing hooks, to avoid oops in advanced SATA drivers o [libata] do not call pci_disable_device() for certain errors o [libata] trivial: whitespace sync with 2.6 o [libata] resync with 2.6 msleep() updates o [libata sata_via] add support for VT6421 SATA o [libata sata_via] minor cleanups John W. Linville: o libata: fix command queue leak when xlat_func fails Mark Lord: o [libata qstor] minor update per LKML comments o sata_qstor: new basic driver for Pacific Digital