Merge branch 'upstream-fixes' into upstream
Conflicts:
drivers/scsi/libata-core.c
diff --git a/drivers/scsi/libata-core.c b/drivers/scsi/libata-core.c
index bf00d2b..e891b83 100644
--- a/drivers/scsi/libata-core.c
+++ b/drivers/scsi/libata-core.c
@@ -3696,7 +3696,7 @@
* ata_pio_sectors - Transfer one or many 512-byte sectors.
* @qc: Command on going
*
- * Transfer one or many ATA_SECT_SIZE of data from/to the
+ * Transfer one or many ATA_SECT_SIZE of data from/to the
* ATA device for the DRQ request.
*
* LOCKING:
@@ -3973,6 +3973,8 @@
} else
ata_qc_complete(qc);
}
+
+ ata_altstatus(ap); /* flush */
}
/**