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

Commit 4f7a307d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (87 commits)
  [SCSI] fusion: fix domain validation loops
  [SCSI] qla2xxx: fix regression on sparc64
  [SCSI] modalias for scsi devices
  [SCSI] sg: cap reserved_size values at max_sectors
  [SCSI] BusLogic: stop using check_region
  [SCSI] tgt: fix rdma transfer bugs
  [SCSI] aacraid: fix aacraid not finding device
  [SCSI] aacraid: Correct SMC products in aacraid.txt
  [SCSI] scsi_error.c: Add EH Start Unit retry
  [SCSI] aacraid: [Fastboot] Panics for AACRAID driver during 'insmod' for kexec test.
  [SCSI] ipr: Driver version to 2.3.2
  [SCSI] ipr: Faster sg list fetch
  [SCSI] ipr: Return better qc_issue errors
  [SCSI] ipr: Disrupt device error
  [SCSI] ipr: Improve async error logging level control
  [SCSI] ipr: PCI unblock config access fix
  [SCSI] ipr: Fix for oops following SATA request sense
  [SCSI] ipr: Log error for SAS dual path switch
  [SCSI] ipr: Enable logging of debug error data for all devices
  [SCSI] ipr: Add new PCI-E IDs to device table
  ...
parents fabb5c4e 72978245

Documentation/scsi/aacraid.txt

+7 −0
Original line number Diff line number Diff line
@@ -37,7 +37,11 @@ Supported Cards/Chipsets 
	9005:0286:9005:029d	Adaptec	2420SA (Intruder HP release)

	9005:0286:9005:02ac	Adaptec	1800 (Typhoon44)

	9005:0285:9005:02b5	Adaptec	5445 (Voodoo44)

	9005:0285:15d9:02b5	SMC	AOC-USAS-S4i

	9005:0285:15d9:02c9	SMC	AOC-USAS-S4iR

	9005:0285:9005:02b6	Adaptec	5805 (Voodoo80)

	9005:0285:15d9:02b6	SMC	AOC-USAS-S8i

	9005:0285:15d9:02ca	SMC	AOC-USAS-S8iR

	9005:0285:9005:02b7	Adaptec	5085 (Voodoo08)

	9005:0285:9005:02bb	Adaptec	3405 (Marauder40LP)

	9005:0285:9005:02bc	Adaptec	3805 (Marauder80LP)
@@ -93,6 +97,9 @@ Supported Cards/Chipsets 
	9005:0286:9005:02ae		(Aurora Lite ARK)

	9005:0285:9005:02b0		(Sunrise Lake ARK)

	9005:0285:9005:02b1	Adaptec	(Voodoo 8 internal 8 external)

	9005:0285:108e:7aac	SUN	STK RAID REM (Voodoo44 Coyote)

	9005:0285:108e:0286	SUN	SG-XPCIESAS-R-IN (Cougar)

	9005:0285:108e:0287	SUN	SG-XPCIESAS-R-EX (Prometheus)



People

-------------------------

Documentation/scsi/ncr53c8xx.txt

+0 −5
Original line number Diff line number Diff line
@@ -562,11 +562,6 @@ if only one has a flaw for some SCSI feature, you can disable the 
support by the driver of this feature at linux start-up and enable

this feature after boot-up only for devices that support it safely.



CONFIG_SCSI_NCR53C8XX_PROFILE_SUPPORT  (default answer: n)

    This option must be set for profiling information to be gathered 

    and printed out through the proc file system. This features may 

    impact performances.



CONFIG_SCSI_NCR53C8XX_IOMAPPED       (default answer: n)

    Answer "y" if you suspect your mother board to not allow memory mapped I/O.

    May slow down performance a little.  This option is required by

block/ll_rw_blk.c

+2 −0
Original line number Diff line number Diff line
@@ -1925,6 +1925,8 @@ blk_init_queue_node(request_fn_proc *rfn, spinlock_t *lock, int node_id) 
	blk_queue_max_hw_segments(q, MAX_HW_SEGMENTS);

	blk_queue_max_phys_segments(q, MAX_PHYS_SEGMENTS);



	q->sg_reserved_size = INT_MAX;



	/*

	 * all done

	 */

block/scsi_ioctl.c

+3 −1
Original line number Diff line number Diff line
@@ -78,7 +78,9 @@ static int sg_set_timeout(request_queue_t *q, int __user *p) 


static int sg_get_reserved_size(request_queue_t *q, int __user *p)

{

	return put_user(q->sg_reserved_size, p);

	unsigned val = min(q->sg_reserved_size, q->max_sectors << 9);



	return put_user(val, p);

}



static int sg_set_reserved_size(request_queue_t *q, int __user *p)

drivers/infiniband/ulp/iser/iser_initiator.c

+1 −1
Original line number Diff line number Diff line
@@ -201,7 +201,7 @@ static int iser_post_receive_control(struct iscsi_conn *conn) 
	 * what's common for both schemes is that the connection is not started

	 */

	if (conn->c_stage != ISCSI_CONN_STARTED)

		rx_data_size = DEFAULT_MAX_RECV_DATA_SEGMENT_LENGTH;

		rx_data_size = ISCSI_DEF_MAX_RECV_SEG_LEN;

	else /* FIXME till user space sets conn->max_recv_dlength correctly */

		rx_data_size = 128;