Merge branch 'upstream-fixes' into upstream

Conflicts:

	drivers/scsi/libata-core.c

drivers/scsi/libata-core.c

@@ -3973,6 +3973,8 @@ static void ata_hsm_qc_complete(struct ata_queued_cmd *qc, int in_wq)
 		} else
 			ata_qc_complete(qc);
 	}
+
+	ata_altstatus(ap); /* flush */
 }
 
 /**