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

Commit 65445174 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: (158 commits)
  [SCSI] Fix printing of failed 32-byte commands
  [SCSI] Fix printing of variable length commands
  [SCSI] libsrp: fix bug in ADDITIONAL CDB LENGTH interpretation
  [SCSI] scsi_dh_alua: Add IBM Power Virtual SCSI ALUA device to dev list
  [SCSI] scsi_dh_alua: add netapp to dev list
  [SCSI] qla2xxx: Update version number to 8.03.02-k1.
  [SCSI] qla2xxx: EEH: Restore PCI saved state during pci slot reset.
  [SCSI] qla2xxx: Add firmware ETS burst support.
  [SCSI] qla2xxx: Correct loop-resync issues during SNS scans.
  [SCSI] qla2xxx: Correct use-after-free issue in terminate_rport_io callback.
  [SCSI] qla2xxx: Correct EH bus-reset handling.
  [SCSI] qla2xxx: Proper clean-up of BSG requests when request times out.
  [SCSI] qla2xxx: Initialize payload receive length in failure path of vendor commands
  [SCSI] fix duplicate removal on error path in scsi_sysfs_add_sdev
  [SCSI] fix refcounting bug in scsi_get_host_dev
  [SCSI] fix memory leak in scsi_report_lun_scan
  [SCSI] lpfc: correct PPC build failure
  [SCSI] raid_class: add raid1e
  [SCSI] mpt2sas: Do not call sas_is_tlr_enabled for RAID volumes.
  [SCSI] zfcp: Introduce header file for qdio structs and inline functions
  ...
parents 64d497f5 77c9cfc5

Documentation/scsi/ChangeLog.megaraid_sas

+16 −0
Original line number Original line Diff line number Diff line 
1 Release Date    : Thur.  Oct 29, 2009 09:12:45 PST 2009 -

			(emaild-id:megaraidlinux@lsi.com)

			Bo Yang



2 Current Version : 00.00.04.17.1-rc1

3 Older Version   : 00.00.04.12



1.	Add the pad_0 in mfi frame structure to 0 to fix the

	context value larger than 32bit value issue.



2.	Add the logic drive list to the driver.  Driver will

	keep the logic drive list internal after driver load.



3.	driver fixed the device update issue after get the AEN

	PD delete/ADD, LD add/delete from FW.



1 Release Date    : Tues.  July 28, 2009 10:12:45 PST 2009 -

1 Release Date    : Tues.  July 28, 2009 10:12:45 PST 2009 -

			(emaild-id:megaraidlinux@lsi.com)

			(emaild-id:megaraidlinux@lsi.com)

			Bo Yang

			Bo Yang

MAINTAINERS

+11 −0
Original line number Original line Diff line number Diff line
@@ -2141,6 +2141,17 @@ S: Supported 
F:	Documentation/fault-injection/

F:	Documentation/fault-injection/

F:	lib/fault-inject.c

F:	lib/fault-inject.c





FCOE SUBSYSTEM (libfc, libfcoe, fcoe)

M:	Robert Love <robert.w.love@intel.com>

L:	devel@open-fcoe.org

W:	www.Open-FCoE.org

S:	Supported

F:	drivers/scsi/libfc/

F:	drivers/scsi/fcoe/

F:	include/scsi/fc/

F:	include/scsi/libfc.h

F:	include/scsi/libfcoe.h



FILE LOCKING (flock() and fcntl()/lockf())

FILE LOCKING (flock() and fcntl()/lockf())

M:	Matthew Wilcox <matthew@wil.cx>

M:	Matthew Wilcox <matthew@wil.cx>

L:	linux-fsdevel@vger.kernel.org

L:	linux-fsdevel@vger.kernel.org

drivers/message/fusion/mptbase.c

+3 −2
Original line number Original line Diff line number Diff line
@@ -126,8 +126,6 @@ static int mfcounter = 0; 
 *  Public data...

 *  Public data...

 */

 */





static struct proc_dir_entry *mpt_proc_root_dir;



#define WHOINIT_UNKNOWN		0xAA

#define WHOINIT_UNKNOWN		0xAA





/*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/

/*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
@@ -146,6 +144,9 @@ static MPT_EVHANDLER MptEvHandlers[MPT_MAX_PROTOCOL_DRIVERS]; 
static MPT_RESETHANDLER		 MptResetHandlers[MPT_MAX_PROTOCOL_DRIVERS];

static MPT_RESETHANDLER		 MptResetHandlers[MPT_MAX_PROTOCOL_DRIVERS];

static struct mpt_pci_driver 	*MptDeviceDriverHandlers[MPT_MAX_PROTOCOL_DRIVERS];

static struct mpt_pci_driver 	*MptDeviceDriverHandlers[MPT_MAX_PROTOCOL_DRIVERS];





#ifdef CONFIG_PROC_FS

static struct proc_dir_entry 	*mpt_proc_root_dir;

#endif





/*

/*

 *  Driver Callback Index's

 *  Driver Callback Index's

drivers/message/fusion/mptbase.h

+2 −2
Original line number Original line Diff line number Diff line
@@ -76,8 +76,8 @@ 
#define COPYRIGHT	"Copyright (c) 1999-2008 " MODULEAUTHOR

#define COPYRIGHT	"Copyright (c) 1999-2008 " MODULEAUTHOR

#endif

#endif





#define MPT_LINUX_VERSION_COMMON	"3.04.13"

#define MPT_LINUX_VERSION_COMMON	"3.04.14"

#define MPT_LINUX_PACKAGE_NAME		"@(#)mptlinux-3.04.13"

#define MPT_LINUX_PACKAGE_NAME		"@(#)mptlinux-3.04.14"

#define WHAT_MAGIC_STRING		"@" "(" "#" ")"

#define WHAT_MAGIC_STRING		"@" "(" "#" ")"





#define show_mptmod_ver(s,ver)  \

#define show_mptmod_ver(s,ver)  \

drivers/message/fusion/mptctl.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -360,8 +360,8 @@ static int mptctl_bus_reset(MPT_ADAPTER *ioc, u8 function) 
	u16		 iocstatus;

	u16		 iocstatus;





	/* bus reset is only good for SCSI IO, RAID PASSTHRU */

	/* bus reset is only good for SCSI IO, RAID PASSTHRU */

	if (!(function == MPI_FUNCTION_RAID_SCSI_IO_PASSTHROUGH) ||

	if (!(function == MPI_FUNCTION_RAID_SCSI_IO_PASSTHROUGH ||

	    (function == MPI_FUNCTION_SCSI_IO_REQUEST)) {

		function == MPI_FUNCTION_SCSI_IO_REQUEST)) {

		dtmprintk(ioc, printk(MYIOC_s_WARN_FMT

		dtmprintk(ioc, printk(MYIOC_s_WARN_FMT

			"TaskMgmt, not SCSI_IO!!\n", ioc->name));

			"TaskMgmt, not SCSI_IO!!\n", ioc->name));

		return -EPERM;

		return -EPERM;