From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 23 Jul 2011 18:13:11 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
X-Git-Tag: v3.1-rc1~270
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=d4e06701b89286a306b31e20ec69a904fae374a1

Merge git://git./linux/kernel/git/jejb/scsi-misc-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (77 commits)
  [SCSI] fix crash in scsi_dispatch_cmd()
  [SCSI] sr: check_events() ignore GET_EVENT when TUR says otherwise
  [SCSI] bnx2i: Fixed kernel panic due to illegal usage of sc->request->cpu
  [SCSI] bfa: Update the driver version to 3.0.2.1
  [SCSI] bfa: Driver and BSG enhancements.
  [SCSI] bfa: Added support to query PHY.
  [SCSI] bfa: Added HBA diagnostics support.
  [SCSI] bfa: Added support for flash configuration
  [SCSI] bfa: Added support to obtain SFP info.
  [SCSI] bfa: Added support for CEE info and stats query.
  [SCSI] bfa: Extend BSG interface.
  [SCSI] bfa: FCS bug fixes.
  [SCSI] bfa: DMA memory allocation enhancement.
  [SCSI] bfa: Brocade-1860 Fabric Adapter vHBA support.
  [SCSI] bfa: Brocade-1860 Fabric Adapter PLL init fixes.
  [SCSI] bfa: Added Fabric Assigned Address(FAA) support
  [SCSI] bfa: IOC bug fixes.
  [SCSI] bfa: Enable ASIC block configuration and query.
  [SCSI] bnx2i: Updated copyright and bump version
  [SCSI] bnx2i: Modified to skip CNIC registration if iSCSI is not supported
  ...

Fix up some trivial conflicts in:
 - drivers/scsi/bnx2fc/{bnx2fc.h,bnx2fc_fcoe.c}:
	Crazy broadcom version number conflicts
 - drivers/target/tcm_fc/tfc_cmd.c
	Just trivial cleanups done on adjacent lines
---

d4e06701b89286a306b31e20ec69a904fae374a1
diff --cc drivers/target/tcm_fc/tfc_cmd.c
index a9e9a31da11d,328ea2bccbdc..a6bfb6deba94
--- a/drivers/target/tcm_fc/tfc_cmd.c
+++ b/drivers/target/tcm_fc/tfc_cmd.c
@@@ -255,17 -256,19 +255,18 @@@ int ft_write_pending(struct se_cmd *se_
  		    (fh->fh_r_ctl == FC_RCTL_DD_DATA_DESC)) {
  			if (se_cmd->se_cmd_flags & SCF_SCSI_DATA_SG_IO_CDB) {
  				/*
 -				 * Map se_mem list to scatterlist, so that
 -				 * DDP can be setup. DDP setup function require
 -				 * scatterlist. se_mem_list is internal to
 -				 * TCM/LIO target
 +				 * cmd may have been broken up into multiple
 +				 * tasks. Link their sgs together so we can
 +				 * operate on them all at once.
  				 */
  				transport_do_task_sg_chain(se_cmd);
 -				cmd->sg = T_TASK(se_cmd)->t_tasks_sg_chained;
 +				cmd->sg = se_cmd->t_tasks_sg_chained;
  				cmd->sg_cnt =
 -					T_TASK(se_cmd)->t_tasks_sg_chained_no;
 +					se_cmd->t_tasks_sg_chained_no;
  			}
- 			if (cmd->sg && lport->tt.ddp_setup(lport, ep->xid,
- 						    cmd->sg, cmd->sg_cnt))
+ 			if (cmd->sg && lport->tt.ddp_target(lport, ep->xid,
+ 							    cmd->sg,
+ 							    cmd->sg_cnt))
  				cmd->was_ddp_setup = 1;
  		}
  	}
@@@ -413,16 -433,16 +425,16 @@@ static void ft_send_tm(struct ft_cmd *c
  		 * FCP4r01 indicates having a combination of
  		 * tm_flags set is invalid.
  		 */
 -		FT_TM_DBG("invalid FCP tm_flags %x\n", fcp->fc_tm_flags);
 +		pr_debug("invalid FCP tm_flags %x\n", fcp->fc_tm_flags);
- 		ft_send_resp_code(cmd, FCP_CMND_FIELDS_INVALID);
+ 		ft_send_resp_code_and_free(cmd, FCP_CMND_FIELDS_INVALID);
  		return;
  	}
  
 -	FT_TM_DBG("alloc tm cmd fn %d\n", tm_func);
 +	pr_debug("alloc tm cmd fn %d\n", tm_func);
  	tmr = core_tmr_alloc_req(&cmd->se_cmd, cmd, tm_func);
  	if (!tmr) {
 -		FT_TM_DBG("alloc failed\n");
 +		pr_debug("alloc failed\n");
- 		ft_send_resp_code(cmd, FCP_TMF_FAILED);
+ 		ft_send_resp_code_and_free(cmd, FCP_TMF_FAILED);
  		return;
  	}
  	cmd->se_cmd.se_tmr_req = tmr;
@@@ -661,7 -681,8 +673,7 @@@ static void ft_send_cmd(struct ft_cmd *
  	return;
  
  err:
- 	ft_send_resp_code(cmd, FCP_CMND_FIELDS_INVALID);
+ 	ft_send_resp_code_and_free(cmd, FCP_CMND_FIELDS_INVALID);
 -	return;
  }
  
  /*