Merge branch 'misc' into for-next

 Conflicts:
	drivers/scsi/ufs/ufshcd.c

diff --cc drivers/scsi/libsas/sas_ata.c
Simple merge

diff --cc drivers/scsi/ufs/ufshcd.c
index a5f3ae3b61700609b103b638d19a24bb0be6d0ef,58d7f264c6649d2f53cff832b90790ef72d1ad26..0625da7a42ee98f16adb9316f10984afeec7df3d
--- 1/drivers/scsi/ufs/ufshcd.c
--- 2/drivers/scsi/ufs/ufshcd.c
+++ b/drivers/scsi/ufs/ufshcd.c
@@@ -6392,16 -6398,17 +6396,16 @@@ static int __ufshcd_issue_tm_cmd(struc
        ufshcd_hold(hba, false);
  
        spin_lock_irqsave(host->host_lock, flags);
 -      task_tag = hba->nutrs + free_slot;
 +      blk_mq_start_request(req);
  
-       treq->req_header.dword_0 |= cpu_to_be32(task_tag);
 +      task_tag = req->tag;
+       treq->upiu_req.req_header.dword_0 |= cpu_to_be32(task_tag);
  
 -      memcpy(hba->utmrdl_base_addr + free_slot, treq, sizeof(*treq));
 -      ufshcd_vops_setup_task_mgmt(hba, free_slot, tm_function);
 +      memcpy(hba->utmrdl_base_addr + task_tag, treq, sizeof(*treq));
 +      ufshcd_vops_setup_task_mgmt(hba, task_tag, tm_function);
  
        /* send command to the controller */
 -      __set_bit(free_slot, &hba->outstanding_tasks);
 +      __set_bit(task_tag, &hba->outstanding_tasks);
  
        /* Make sure descriptors are ready before ringing the task doorbell */
        wmb();