Merge remote-tracking branch 'scsi-queue/core-for-3.19' into for-linus

diff --cc block/blk-mq.c
Simple merge

diff --cc block/scsi_ioctl.c
Simple merge

diff --cc drivers/scsi/bnx2fc/bnx2fc_fcoe.c
Simple merge

diff --cc drivers/scsi/ufs/ufshcd.c
index 605ca60e8a10da25bed98f9d2ac6fdb42b13176f,362b818ad827df6786f1a4c186c3e699e3a5e52b..820fc7d960844c0ade93ac8e7cd85efac067b1da
--- 1/drivers/scsi/ufs/ufshcd.c
--- 2/drivers/scsi/ufs/ufshcd.c
+++ b/drivers/scsi/ufs/ufshcd.c
@@@ -2860,15 -2838,9 +2856,14 @@@ static void ufshcd_slave_destroy(struc
        struct ufs_hba *hba;
  
        hba = shost_priv(sdev->host);
-       scsi_deactivate_tcq(sdev, hba->nutrs);
        /* Drop the reference as it won't be needed anymore */
 -      if (ufshcd_scsi_to_upiu_lun(sdev->lun) == UFS_UPIU_UFS_DEVICE_WLUN)
 +      if (ufshcd_scsi_to_upiu_lun(sdev->lun) == UFS_UPIU_UFS_DEVICE_WLUN) {
 +              unsigned long flags;
 +
 +              spin_lock_irqsave(hba->host->host_lock, flags);
                hba->sdev_ufs_device = NULL;
 +              spin_unlock_irqrestore(hba->host->host_lock, flags);
 +      }
  }
  
  /**

diff --cc drivers/target/target_core_pr.c
Simple merge