Merge branch 'upstream-fixes'

diff --cc drivers/scsi/libata-core.c
index 62340f4ef004463c7de20656f37fb3d483121207,5f1d7580218dde548ccd0d8ba4f71589ed5efcc6..70efde99f65220cb422a5689778587212e9cdcad
--- 1/drivers/scsi/libata-core.c
--- 2/drivers/scsi/libata-core.c
+++ b/drivers/scsi/libata-core.c
@@@ -2586,11 -2510,11 +2586,11 @@@ static void ata_sg_clean(struct ata_que
        int dir = qc->dma_dir;
        void *pad_buf = NULL;
  
 -      assert(qc->flags & ATA_QCFLAG_DMAMAP);
 -      assert(sg != NULL);
 +      WARN_ON(!(qc->flags & ATA_QCFLAG_DMAMAP));
 +      WARN_ON(sg == NULL);
  
        if (qc->flags & ATA_QCFLAG_SINGLE)
-               WARN_ON(qc->n_elem != 1);
 -              assert(qc->n_elem <= 1);
++              WARN_ON(qc->n_elem > 1);
  
        VPRINTK("unmapping %u sg elements\n", qc->n_elem);
  
@@@ -2645,8 -2569,8 +2645,8 @@@ static void ata_fill_sg(struct ata_queu
        struct scatterlist *sg;
        unsigned int idx;
  
 -      assert(qc->__sg != NULL);
 -      assert(qc->n_elem > 0 || qc->pad_len > 0);
 +      WARN_ON(qc->__sg == NULL);
-       WARN_ON(qc->n_elem == 0);
++      WARN_ON(qc->n_elem == 0 && qc->pad_len == 0);
  
        idx = 0;
        ata_for_each_sg(sg, qc) {

diff --cc drivers/scsi/sata_qstor.c
index 286482630be30c7411cc4c4596e6eec591c4d3a2,80480f0fb2b82abf2ebdcbe156abd994d9b9ff27..9602f43a298e1a2c7290e461ff00d7f6dcf479ef
--- 1/drivers/scsi/sata_qstor.c
--- 2/drivers/scsi/sata_qstor.c
+++ b/drivers/scsi/sata_qstor.c
@@@ -276,8 -276,8 +276,8 @@@ static unsigned int qs_fill_sg(struct a
        unsigned int nelem;
        u8 *prd = pp->pkt + QS_CPB_BYTES;
  
 -      assert(qc->__sg != NULL);
 -      assert(qc->n_elem > 0 || qc->pad_len > 0);
 +      WARN_ON(qc->__sg == NULL);
-       WARN_ON(qc->n_elem == 0);
++      WARN_ON(qc->n_elem == 0 && qc->pad_len == 0);
  
        nelem = 0;
        ata_for_each_sg(sg, qc) {

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