Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2419505a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (21 commits)
  [SCSI] Revert "[SCSI] aacraid: fib context lock for management ioctls"
  [SCSI] bsg: copy the cmd_type field to the subordinate request for bidi
  [SCSI] handle scsi_init_queue failure properly
  [SCSI] destroy scsi_bidi_sdb_cache in scsi_exit_queue
  [SCSI] scsi_debug: add XDWRITEREAD_10 support
  [SCSI] scsi_debug: add bidi data transfer support
  [SCSI] scsi_debug: add get_data_transfer_info helper function
  [SCSI] remove use_sg_chaining
  [SCSI] bidirectional: fix up for the new blk_end_request code
  [SCSI] bidirectional command support
  [SCSI] implement scsi_data_buffer
  [SCSI] tgt: use scsi_init_io instead of scsi_alloc_sgtable
  [SCSI] aic7xxx: fix warnings with CONFIG_PM disabled
  [SCSI] aic79xx: fix warnings with CONFIG_PM disabled
  [SCSI] aic7xxx: fix ahc_done check SCB_ACTIVE for tagged transactions
  [SCSI] sgiwd93: use cached memory access to make driver work on IP28
  [SCSI] zfcp: fix sense_buffer access bug
  [SCSI] ncr53c8xx: fix sense_buffer access bug
  [SCSI] aic79xx: fix sense_buffer access bug
  [SCSI] hptiop: fix sense_buffer access bug
  ...
parents caf03feb 203a512f

arch/ia64/hp/sim/simscsi.c

+0 −1
Original line number Diff line number Diff line
@@ -360,7 +360,6 @@ static struct scsi_host_template driver_template = { 
	.max_sectors		= 1024,

	.cmd_per_lun		= SIMSCSI_REQ_QUEUE_LEN,

	.use_clustering		= DISABLE_CLUSTERING,

	.use_sg_chaining	= ENABLE_SG_CHAINING,

};



static int __init

block/bsg.c

+1 −0
Original line number Diff line number Diff line
@@ -279,6 +279,7 @@ bsg_map_hdr(struct bsg_device *bd, struct sg_io_v4 *hdr) 
			goto out;

		}

		rq->next_rq = next_rq;

		next_rq->cmd_type = rq->cmd_type;



		dxferp = (void*)(unsigned long)hdr->din_xferp;

		ret =  blk_rq_map_user(q, next_rq, dxferp, hdr->din_xfer_len);

drivers/infiniband/ulp/srp/ib_srp.c

+0 −1
Original line number Diff line number Diff line
@@ -1571,7 +1571,6 @@ static struct scsi_host_template srp_template = { 
	.this_id			= -1,

	.cmd_per_lun			= SRP_SQ_SIZE,

	.use_clustering			= ENABLE_CLUSTERING,

	.use_sg_chaining		= ENABLE_SG_CHAINING,

	.shost_attrs			= srp_host_attrs

};

drivers/s390/scsi/zfcp_fsf.c

+2 −2
Original line number Diff line number Diff line
@@ -4224,10 +4224,10 @@ zfcp_fsf_send_fcp_command_task_handler(struct zfcp_fsf_req *fsf_req) 


		ZFCP_LOG_TRACE("%i bytes sense data provided by FCP\n",

			       fcp_rsp_iu->fcp_sns_len);

		memcpy(&scpnt->sense_buffer,

		memcpy(scpnt->sense_buffer,

		       zfcp_get_fcp_sns_info_ptr(fcp_rsp_iu), sns_len);

		ZFCP_HEX_DUMP(ZFCP_LOG_LEVEL_TRACE,

			      (void *) &scpnt->sense_buffer, sns_len);

			      (void *)scpnt->sense_buffer, sns_len);

	}



	/* check for overrun */

drivers/scsi/3w-9xxx.c

+0 −1
Original line number Diff line number Diff line
@@ -1990,7 +1990,6 @@ static struct scsi_host_template driver_template = { 
	.max_sectors		= TW_MAX_SECTORS,

	.cmd_per_lun		= TW_MAX_CMDS_PER_LUN,

	.use_clustering		= ENABLE_CLUSTERING,

	.use_sg_chaining	= ENABLE_SG_CHAINING,

	.shost_attrs		= twa_host_attrs,

	.emulated		= 1

};