Merge aws

[pcd1193182]

This PR fixes a merge conflict in the linux kernel code in the iscsi logic. The diff is massive, because of some history rewriting that occurred upstream.

The merge conflict was in drivers/target/iscsi/iscsi_target.c, and our version was taken of all conflicting areas.

diff --cc drivers/target/iscsi/iscsi_target.c
index f606e82a8c6e,6544febe0195..000000000000
--- a/drivers/target/iscsi/iscsi_target.c
+++ b/drivers/target/iscsi/iscsi_target.c
@@@ -483,8 -483,7 +483,12 @@@ EXPORT_SYMBOL(iscsit_queue_rsp)
  void iscsit_aborted_task(struct iscsi_conn *conn, struct iscsi_cmd *cmd)
  {
  	spin_lock_bh(&conn->cmd_lock);
++<<<<<<< HEAD
 +	if (!list_empty(&cmd->i_conn_node))
 +		list_del_init(&cmd->i_conn_node);
++=======
+ 	list_del_init(&cmd->i_conn_node);
++>>>>>>> 7a76e0ef706b... DLPX-72513 cmd_kref leak prevents reestablishing connection for iSCSI initiator
  	spin_unlock_bh(&conn->cmd_lock);
  
  	__iscsit_free_cmd(cmd, true);
@@@ -4079,26 -4079,19 +4084,33 @@@ static void iscsit_release_commands_fro
  	 * has been reset -> returned sleeping pre-handler state.
  	 */
  	spin_lock_bh(&conn->cmd_lock);
- 	list_splice_init(&conn->conn_cmd_list, &tmp_list);
+ 	list_splice_init(&conn->conn_cmd_list, &tmp_cmd_list);
  
++<<<<<<< HEAD
 +	list_for_each_entry_safe(cmd, cmd_tmp, &tmp_list, i_conn_node) {
++=======
+ 	list_for_each_entry_safe(cmd, cmd_tmp, &tmp_cmd_list, i_conn_node) {
++>>>>>>> 7a76e0ef706b... DLPX-72513 cmd_kref leak prevents reestablishing connection for iSCSI initiator
  		struct se_cmd *se_cmd = &cmd->se_cmd;
  
  		if (se_cmd->se_tfo != NULL) {
  			spin_lock_irq(&se_cmd->t_state_lock);
 -			se_cmd->transport_state |= CMD_T_FABRIC_STOP;
 +			if (se_cmd->transport_state & CMD_T_ABORTED) {
 +				/*
 +				 * LIO's abort path owns the cleanup for this,
 +				 * so put it back on the list and let
 +				 * aborted_task handle it.
 +				 */
 +				list_move_tail(&cmd->i_conn_node,
 +					       &conn->conn_cmd_list);
 +			} else {
 +				se_cmd->transport_state |= CMD_T_FABRIC_STOP;
 +			}
  			spin_unlock_irq(&se_cmd->t_state_lock);
  		}
+ 
+ 		if (se_cmd->se_cmd_flags & SCF_SCSI_TMR_CDB)
+ 			list_move_tail(&cmd->i_conn_node, &tmp_tmr_list);
  	}
  	spin_unlock_bh(&conn->cmd_lock);