Merge branch 'for-7.0-fixes' into for-7.1

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

diff --cc drivers/ata/libata-eh.c
Simple merge

diff --cc drivers/ata/libata-scsi.c
index 4225c6d7ff35977402c2e6a6ea513344557e761c,3b65df914ebbe7604d13324fccea85c14cb93b79..00b3ffbfe169acaf912af33ff9b4e74238d1f0b9
--- 1/drivers/ata/libata-scsi.c
--- 2/drivers/ata/libata-scsi.c
+++ b/drivers/ata/libata-scsi.c
@@@ -1697,10 -1694,15 +1697,11 @@@ void ata_scsi_requeue_deferred_qc(struc
         * do not try to be smart about what to do with this deferred command
         * and simply retry it by completing it with DID_SOFT_ERROR.
         */
 -      if (!qc)
 -              return;
 -
 -      scmd = qc->scsicmd;
 -      ap->deferred_qc = NULL;
 -      cancel_work(&ap->deferred_qc_work);
 -      ata_qc_free(qc);
 -      scmd->result = (DID_SOFT_ERROR << 16);
 -      scsi_done(scmd);
 +      if (qc) {
 +              ap->deferred_qc = NULL;
++              cancel_work(&ap->deferred_qc_work);
 +              ata_scsi_qc_done(qc, true, DID_SOFT_ERROR << 16);
 +      }
  }
  
  static void ata_scsi_schedule_deferred_qc(struct ata_port *ap)