Merge branch 'upstream'

Conflicts:

	drivers/scsi/libata-core.c

diff --cc drivers/scsi/libata-core.c
index dcce0f494d4a3fb42d0f03fe23a64a1da5495f35,0aff888d9ecdd42b9756f17fb983336c946de86d..c3c4263fdb123927a7c113be09b34f30ab5ed1f3
--- 1/drivers/scsi/libata-core.c
--- 2/drivers/scsi/libata-core.c
+++ b/drivers/scsi/libata-core.c
@@@ -64,10 -64,9 +64,10 @@@
  static unsigned int ata_dev_init_params(struct ata_port *ap,
                                        struct ata_device *dev);
  static void ata_set_mode(struct ata_port *ap);
- static void ata_dev_set_xfermode(struct ata_port *ap, struct ata_device *dev);
+ static unsigned int ata_dev_set_xfermode(struct ata_port *ap,
+                                        struct ata_device *dev);
+ static void ata_dev_xfermask(struct ata_port *ap, struct ata_device *dev);
 +static void ata_pio_error(struct ata_port *ap);
- static unsigned int ata_dev_xfermask(struct ata_port *ap,
-                                    struct ata_device *dev);
  
  static unsigned int ata_unique_id = 1;
  static struct workqueue_struct *ata_wq;

diff --cc drivers/scsi/sata_vsc.c
index 9f621a97c977b95d077f1584fd5ad59e90ef1649,836bbbb26ff2c1c37cb76608821156babd9d776c..5af6d5f9f4bd43e8ffdfb016cac92581b75f30e2
--- 1/drivers/scsi/sata_vsc.c
--- 2/drivers/scsi/sata_vsc.c
+++ b/drivers/scsi/sata_vsc.c
@@@ -233,11 -226,11 +233,11 @@@ static irqreturn_t vsc_sata_interrupt (
                                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 if (is_vsc_sata_int_err(i, int_status)) {
 +                              else if (is_vsc_sata_int_err(i, int_status)) {
                                        /*
-                                        * On some chips (i.e. Intel 31244), an error 
+                                        * On some chips (i.e. Intel 31244), an error
                                         * interrupt will sneak in at initialization
                                         * time (phy state changes).  Clearing the SCR
                                         * error register is not required, but it prevents

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