Merge branch 'misc' into for-next

Conflicts:
	drivers/target/iscsi/iscsi_target.c

diff --cc drivers/target/iscsi/iscsi_target.c
index 61c14dd31e1cd982349a829ef76b5d42267a98be,2c54c5d8412d8e05453f3f5028cb6adf6a36a60e..01f5edbfc170fc378324c026291786dc0aca4352
--- 1/drivers/target/iscsi/iscsi_target.c
--- 2/drivers/target/iscsi/iscsi_target.c
+++ b/drivers/target/iscsi/iscsi_target.c
@@@ -1166,8 -1166,10 +1166,9 @@@ int iscsit_setup_scsi_cmd(struct iscsi_
  
        target_get_sess_cmd(&cmd->se_cmd, true);
  
+       cmd->se_cmd.tag = (__force u32)cmd->init_task_tag;
        cmd->sense_reason = target_cmd_init_cdb(&cmd->se_cmd, hdr->cdb,
                                                GFP_KERNEL);
 -
        if (cmd->sense_reason) {
                if (cmd->sense_reason == TCM_OUT_OF_RESOURCES) {
                        return iscsit_add_reject_cmd(cmd,