Merge branch 'upstream'

diff --cc drivers/scsi/libata-core.c
Simple merge

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

diff --cc drivers/scsi/sata_nv.c
index 8fdb2336f6f36cb15665e2d41ec95c4be08d618a,bbbb55eeb73a521d52797bf9da858fbad7040911..945194b7699819551dafe3d66d4a83a44946da6a
--- 1/drivers/scsi/sata_nv.c
--- 2/drivers/scsi/sata_nv.c
+++ b/drivers/scsi/sata_nv.c
@@@ -308,8 -313,12 +313,12 @@@ static irqreturn_t nv_interrupt (int ir
                        struct ata_queued_cmd *qc;
  
                        qc = ata_qc_from_tag(ap, ap->active_tag);
 -                      if (qc && (!(qc->tf.ctl & ATA_NIEN)))
 +                      if (qc && (!(qc->tf.flags & ATA_TFLAG_POLLING)))
                                handled += ata_host_intr(ap, qc);
+                       else
+                               // No request pending?  Clear interrupt status
+                               // anyway, in case there's one pending.
+                               ap->ops->check_status(ap);
                }
  
        }

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

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

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

diff --cc include/linux/ata.h
index f512104a1a3f56c7b5694f618bfe23c0de351424,94f77cce27fa10d634b7ffdbeb415d31613833b5..29fa99bde2be5b0c459979241390ec9d77385a5e
--- 1/include/linux/ata.h
--- 2/include/linux/ata.h
+++ b/include/linux/ata.h
@@@ -192,7 -196,7 +196,8 @@@ enum 
        ATA_TFLAG_DEVICE        = (1 << 2), /* enable r/w to device reg */
        ATA_TFLAG_WRITE         = (1 << 3), /* data dir: host->dev==1 (write) */
        ATA_TFLAG_LBA           = (1 << 4), /* enable LBA */
-       ATA_TFLAG_POLLING       = (1 << 5), /* set nIEN to 1 and use polling */
+       ATA_TFLAG_FUA           = (1 << 5), /* enable FUA */
++      ATA_TFLAG_POLLING       = (1 << 6), /* set nIEN to 1 and use polling */
  };
  
  enum ata_tf_protocols {

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