Commit 382f51fe 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: (222 commits)
  [SCSI] zfcp: Remove flag ZFCP_STATUS_FSFREQ_TMFUNCNOTSUPP
  [SCSI] zfcp: Activate fc4s attributes for zfcp in FC transport class
  [SCSI] zfcp: Block scsi_eh thread for rport state BLOCKED
  [SCSI] zfcp: Update FSF error reporting
  [SCSI] zfcp: Improve ELS ADISC handling
  [SCSI] zfcp: Simplify handling of ct and els requests
  [SCSI] zfcp: Remove ZFCP_DID_MASK
  [SCSI] zfcp: Move WKA port to zfcp FC code
  [SCSI] zfcp: Use common code definitions for FC CT structs
  [SCSI] zfcp: Use common code definitions for FC ELS structs
  [SCSI] zfcp: Update FCP protocol related code
  [SCSI] zfcp: Dont fail SCSI commands when transitioning to blocked fc_rport
  [SCSI] zfcp: Assign scheduled work to driver queue
  [SCSI] zfcp: Remove STATUS_COMMON_REMOVE flag as it is not required anymore
  [SCSI] zfcp: Implement module unloading
  [SCSI] zfcp: Merge trace code for fsf requests in one function
  [SCSI] zfcp: Access ports and units with container_of in sysfs code
  [SCSI] zfcp: Remove suspend callback
  [SCSI] zfcp: Remove global config_mutex
  [SCSI] zfcp: Replace local reference counting with common kref
  ...
parents 701791cc 54987386

Documentation/ABI/stable/sysfs-driver-qla2xxx

0 → 100644
+8 −0
Original line number Diff line number Diff line 
What:		/sys/bus/pci/drivers/qla2xxx/.../devices/*

Date:		September 2009

Contact:	QLogic Linux Driver <linux-driver@qlogic.com>

Description:	qla2xxx-udev.sh currently looks for uevent CHANGE events to

		signal a firmware-dump has been generated by the driver and is

		ready for retrieval.

Users:		qla2xxx-udev.sh.  Proposed changes should be mailed to

		linux-driver@qlogic.com

Documentation/scsi/ChangeLog.megaraid_sas

+62 −0
Original line number Diff line number Diff line 
1 Release Date    : Tues.  July 28, 2009 10:12:45 PST 2009 -

			(emaild-id:megaraidlinux@lsi.com)

			Bo Yang



2 Current Version : 00.00.04.12

3 Older Version   : 00.00.04.10



1.	Change the AEN sys PD update from scsi_scan to

	scsi_add_device and scsi_remove_device.

2.	Takeoff the debug print-out in aen_polling routine.



1 Release Date    : Thur.  July 02, 2009 10:12:45 PST 2009 -

			(emaild-id:megaraidlinux@lsi.com)

			Bo Yang



2 Current Version : 00.00.04.10

3 Older Version   : 00.00.04.08



1.	Add the 3 mins timeout during the controller initialize.

2.	Add the fix for 64bit sense date errors.



1 Release Date    : Tues. May 05, 2009 10:12:45 PST 2009 -

			(emaild-id:megaraidlinux@lsi.com)

			Bo Yang



2 Current Version : 00.00.04.08

3 Older Version   : 00.00.04.06



1.	Add the fix of pending in FW after deleted the logic drives.

2.	Add the fix of deallocating memory after get pdlist.



1 Release Date    : Tues. March 26, 2009 10:12:45 PST 2009 -

			(emaild-id:megaraidlinux@lsi.com)

			Bo Yang



2 Current Version : 00.00.04.06

3 Older Version   : 00.00.04.04



1.	Add the fix of the driver cmd empty fix of the driver cmd empty.

2.	Add the fix of the driver MSM AEN CMD cause the system slow.



1 Release Date    : Tues. March 03, 2009 10:12:45 PST 2009 -

			(emaild-id:megaraidlinux@lsi.com)

			Bo Yang



2 Current Version : 00.00.04.04

3 Older Version   : 00.00.04.01



1.	Add the Tape drive fix to the driver: If the command is for

	the tape device, set the pthru timeout to the os layer timeout value.



2.	Add Poll_wait mechanism to Gen-2 Linux driv.

		In the aen handler, driver needs to wakeup poll handler similar to

		the way it raises SIGIO.



3.	Add new controller new SAS2 support to the driver.



4.	Report the unconfigured PD (system PD) to OS.



5.	Add the IEEE SGL support to the driver



6.	Reasign the Application cmds to SAS2 controller



1 Release Date    : Thur.July. 24 11:41:51 PST 2008 -

                       (emaild-id:megaraidlinux@lsi.com)

MAINTAINERS

+15 −0
Original line number Diff line number Diff line
@@ -4196,6 +4196,13 @@ W: http://www.pmc-sierra.com/ 
S:	Supported

F:	drivers/scsi/pmcraid.*



PMC SIERRA PM8001 DRIVER

M:	jack_wang@usish.com

M:	lindar_liu@usish.com

L:	linux-scsi@vger.kernel.org

S:	Supported

F:	drivers/scsi/pm8001/



POSIX CLOCKS and TIMERS

M:	Thomas Gleixner <tglx@linutronix.de>

S:	Supported
@@ -5772,6 +5779,14 @@ L: netdev@vger.kernel.org 
S:	Maintained

F:	drivers/net/vmxnet3/



VMware PVSCSI driver

M:	Alok Kataria <akataria@vmware.com>

M:	VMware PV-Drivers <pv-drivers@vmware.com>

L:	linux-scsi@vger.kernel.org

S:	Maintained

F:	drivers/scsi/vmw_pvscsi.c

F:	drivers/scsi/vmw_pvscsi.h



VOLTAGE AND CURRENT REGULATOR FRAMEWORK

M:	Liam Girdwood <lrg@slimlogic.co.uk>

M:	Mark Brown <broonie@opensource.wolfsonmicro.com>

drivers/ata/libata-scsi.c

+6 −1
Original line number Diff line number Diff line
@@ -1208,6 +1208,7 @@ void ata_scsi_slave_destroy(struct scsi_device *sdev) 
 *	ata_scsi_change_queue_depth - SCSI callback for queue depth config

 *	@sdev: SCSI device to configure queue depth for

 *	@queue_depth: new queue depth

 *	@reason: calling context

 *

 *	This is libata standard hostt->change_queue_depth callback.

 *	SCSI will call into this callback when user tries to set queue
@@ -1219,12 +1220,16 @@ void ata_scsi_slave_destroy(struct scsi_device *sdev) 
 *	RETURNS:

 *	Newly configured queue depth.

 */

int ata_scsi_change_queue_depth(struct scsi_device *sdev, int queue_depth)

int ata_scsi_change_queue_depth(struct scsi_device *sdev, int queue_depth,

				int reason)

{

	struct ata_port *ap = ata_shost_to_port(sdev->host);

	struct ata_device *dev;

	unsigned long flags;



	if (reason != SCSI_QDEPTH_DEFAULT)

		return -EOPNOTSUPP;



	if (queue_depth < 1 || queue_depth == sdev->queue_depth)

		return sdev->queue_depth;

drivers/ata/sata_nv.c

+1 −1
Original line number Diff line number Diff line
@@ -1975,7 +1975,7 @@ static int nv_swncq_slave_config(struct scsi_device *sdev) 
	ata_id_c_string(dev->id, model_num, ATA_ID_PROD, sizeof(model_num));



	if (strncmp(model_num, "Maxtor", 6) == 0) {

		ata_scsi_change_queue_depth(sdev, 1);

		ata_scsi_change_queue_depth(sdev, 1, SCSI_QDEPTH_DEFAULT);

		ata_dev_printk(dev, KERN_NOTICE,

			"Disabling SWNCQ mode (depth %x)\n", sdev->queue_depth);

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE