Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev: AHCI: Remove an unnecessary flush from ahci_qc_issue AHCI: speed up resume [libata] Add support for VPD page b1 ata: endianness annotations in pata drivers libata-eh: update atapi_eh_request_sense() to take @dev instead of @qc [libata] sata_svw: update code comments relating to data corruption libata/ahci: enclosure management support libata: improve EH internal command timeout handling libata: use ULONG_MAX to terminate reset timeout table libata: improve EH retry delay handling libata: consistently use msecs for time durations
Showing
- drivers/ata/ahci.c 325 additions, 6 deletionsdrivers/ata/ahci.c
- drivers/ata/libata-core.c 32 additions, 24 deletionsdrivers/ata/libata-core.c
- drivers/ata/libata-eh.c 171 additions, 48 deletionsdrivers/ata/libata-eh.c
- drivers/ata/libata-pmp.c 2 additions, 11 deletionsdrivers/ata/libata-pmp.c
- drivers/ata/libata-scsi.c 98 additions, 1 deletiondrivers/ata/libata-scsi.c
- drivers/ata/libata-sff.c 8 additions, 7 deletionsdrivers/ata/libata-sff.c
- drivers/ata/libata.h 2 additions, 0 deletionsdrivers/ata/libata.h
- drivers/ata/pata_bf54x.c 3 additions, 3 deletionsdrivers/ata/pata_bf54x.c
- drivers/ata/pata_legacy.c 4 additions, 6 deletionsdrivers/ata/pata_legacy.c
- drivers/ata/pata_qdi.c 1 addition, 1 deletiondrivers/ata/pata_qdi.c
- drivers/ata/pata_scc.c 1 addition, 1 deletiondrivers/ata/pata_scc.c
- drivers/ata/pata_winbond.c 1 addition, 1 deletiondrivers/ata/pata_winbond.c
- drivers/ata/sata_svw.c 23 additions, 15 deletionsdrivers/ata/sata_svw.c
- include/linux/libata.h 45 additions, 10 deletionsinclude/linux/libata.h
Loading
Please register or sign in to comment