Merge branch 'upstream'

diff --cc drivers/scsi/libata-core.c
index ff31b0b,14cdbb3..c93bb1b
--- 1/drivers/scsi/libata-core.c
--- 2/drivers/scsi/libata-core.c
+++ b/drivers/scsi/libata-core.c
@@@ -1073,9 -1072,17 +1073,10 @@@ static unsigned int ata_pio_modes(cons
  }
  
  static inline void
 -ata_queue_packet_task(struct ata_port *ap)
 -{
 -      if (!(ap->flags & ATA_FLAG_FLUSH_PIO_TASK))
 -              queue_work(ata_wq, &ap->packet_task);
 -}
 -
 -static inline void
  ata_queue_pio_task(struct ata_port *ap)
  {
-       queue_work(ata_wq, &ap->pio_task);
+       if (!(ap->flags & ATA_FLAG_FLUSH_PIO_TASK))
+               queue_work(ata_wq, &ap->pio_task);
  }
  
  static inline void

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

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

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