Merge branch 'upstream'

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

diff --cc drivers/scsi/libata-core.c
index 3171e386f706c28778523d6a6656e4b39107d7e3,771bc7d376bc2e73a7861ce76fae9f8f37663f1a..0d58f4d3e5ce65888f4ca1b960baa77cbc20f5ca
--- 1/drivers/scsi/libata-core.c
--- 2/drivers/scsi/libata-core.c
+++ b/drivers/scsi/libata-core.c
@@@ -2598,20 -2555,12 +2577,18 @@@ void ata_qc_prep(struct ata_queued_cmd 
  
  void ata_sg_init_one(struct ata_queued_cmd *qc, void *buf, unsigned int buflen)
  {
 +      struct scatterlist *sg;
 +
        qc->flags |= ATA_QCFLAG_SINGLE;
  
 -      qc->sg = &qc->sgent;
 +      memset(&qc->sgent, 0, sizeof(qc->sgent));
 +      qc->__sg = &qc->sgent;
        qc->n_elem = 1;
 +      qc->orig_n_elem = 1;
        qc->buf_virt = buf;
 -      sg_init_one(qc->sg, buf, buflen);
 +
 +      sg = qc->__sg;
-       sg->page = virt_to_page(buf);
-       sg->offset = (unsigned long) buf & ~PAGE_MASK;
-       sg->length = buflen;
++      sg_init_one(sg, buf, buflen);
  }
  
  /**

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

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

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