Merge branch 'upstream'

diff --cc drivers/scsi/libata-core.c
index 592d3a86c8401d1915b034f1667966bbc369f7f5,cef85e515c4c4290d94d6148a2b152441d11464e..3fd55ef5410f71a9c90a145e2238dbec905ba003
--- 1/drivers/scsi/libata-core.c
--- 2/drivers/scsi/libata-core.c
+++ b/drivers/scsi/libata-core.c
@@@ -3553,12 -3394,11 +3564,12 @@@ static void ata_pio_error(struct ata_po
  {
        struct ata_queued_cmd *qc;
  
 -      printk(KERN_WARNING "ata%u: PIO error\n", ap->id);
 -
        qc = ata_qc_from_tag(ap, ap->active_tag);
-       assert(qc != NULL);
+       WARN_ON(qc == NULL);
  
 +      if (qc->tf.command != ATA_CMD_PACKET)
 +              printk(KERN_WARNING "ata%u: PIO error\n", ap->id);
 +
        /* make sure qc->err_mask is available to 
         * know what's wrong and recover
         */

diff --cc drivers/scsi/sata_mv.c
Simple merge

diff --cc drivers/scsi/sata_qstor.c
Simple merge

diff --cc drivers/scsi/sata_sx4.c
Simple merge

diff --cc include/linux/libata.h
Simple merge