From: James Bottomley <James.Bottomley@HansenPartnership.com>
Date: Tue, 20 Apr 2021 15:01:41 +0000 (-0700)
Subject: Merge branch 'misc' into for-next
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=755e78ccbb075197205c37a16956e23b23f517d0;p=users%2Fjedix%2Flinux-maple.git

Merge branch 'misc' into for-next

Conflicts:
	drivers/target/iscsi/iscsi_target.c
---

755e78ccbb075197205c37a16956e23b23f517d0
diff --cc drivers/target/iscsi/iscsi_target.c
index 61c14dd31e1cd,2c54c5d8412d8..01f5edbfc170f
--- a/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,