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

Commit d71f5be2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

SCSI updates on 20120118

* tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (49 commits)
  [SCSI] libfc: remove redundant timer init for fcp
  [SCSI] fcoe: Move fcoe_debug_logging from fcoe.h to fcoe.c
  [SCSI] libfc: Declare local functions static
  [SCSI] fcoe: fix regression on offload em matching function for initiator/target
  [SCSI] qla4xxx: Update driver version to 5.02.00-k12
  [SCSI] qla4xxx: Cleanup modinfo display
  [SCSI] qla4xxx: Update license
  [SCSI] qla4xxx: Clear the RISC interrupt bit during FW init
  [SCSI] qla4xxx: Added error logging for firmware abort
  [SCSI] qla4xxx: Disable generating pause frames in case of FW hung
  [SCSI] qla4xxx: Temperature monitoring for ISP82XX core.
  [SCSI] megaraid: fix sparse warnings
  [SCSI] sg: convert to kstrtoul_from_user()
  [SCSI] don't change sdev starvation list order without request dispatched
  [SCSI] isci: fix, prevent port from getting stuck in the 'configuring' state
  [SCSI] isci: fix start OOB
  [SCSI] isci: fix io failures while wide port links are coming up
  [SCSI] isci: allow more time for wide port targets
  [SCSI] isci: enable wide port targets
  [SCSI] isci: Fix IO fails when pull cable from phy in x4 wideport in MPC mode.
  ...
parents 92b5abbb 76ffe8a3

Documentation/scsi/ChangeLog.megaraid_sas

+10 −0
Original line number Original line Diff line number Diff line 
Release Date    : Fri. Jan 6, 2012 17:00:00 PST 2010 -

			(emaild-id:megaraidlinux@lsi.com)

			Adam Radford

Current Version : 00.00.06.14-rc1

Old Version     : 00.00.06.12-rc1

    1. Fix reglockFlags for degraded raid5/6 for MR 9360/9380.

    2. Mask off flags in ioctl path to prevent memory scribble with older

       MegaCLI versions.

    3. Remove poll_mode_io module paramater, sysfs node, and associated code.

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

Release Date    : Wed. Oct 5, 2011 17:00:00 PST 2010 -

Release Date    : Wed. Oct 5, 2011 17:00:00 PST 2010 -

			(emaild-id:megaraidlinux@lsi.com)

			(emaild-id:megaraidlinux@lsi.com)

			Adam Radford

			Adam Radford

Documentation/scsi/LICENSE.qla4xxx

+1 −22
Original line number Original line Diff line number Diff line 
Copyright (c) 2003-2011 QLogic Corporation

Copyright (c) 2003-2011 QLogic Corporation

QLogic Linux iSCSI HBA Driver

QLogic Linux iSCSI Driver





This program includes a device driver for Linux 3.x.

This program includes a device driver for Linux 3.x.

You may modify and redistribute the device driver code under the

You may modify and redistribute the device driver code under the

GNU General Public License (a copy of which is attached hereto as

GNU General Public License (a copy of which is attached hereto as

Exhibit A) published by the Free Software Foundation (version 2).

Exhibit A) published by the Free Software Foundation (version 2).





REGARDLESS OF WHAT LICENSING MECHANISM IS USED OR APPLICABLE,

THIS PROGRAM IS PROVIDED BY QLOGIC CORPORATION "AS IS'' AND ANY

EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE

IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A

PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR

BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,

EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED

TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,

DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON

ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,

OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY

OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE

POSSIBILITY OF SUCH DAMAGE.



USER ACKNOWLEDGES AND AGREES THAT USE OF THIS PROGRAM WILL NOT

CREATE OR GIVE GROUNDS FOR A LICENSE BY IMPLICATION, ESTOPPEL, OR

OTHERWISE IN ANY INTELLECTUAL PROPERTY RIGHTS (PATENT, COPYRIGHT,

TRADE SECRET, MASK WORK, OR OTHER PROPRIETARY RIGHT) EMBODIED IN

ANY OTHER QLOGIC HARDWARE OR SOFTWARE EITHER SOLELY OR IN

COMBINATION WITH THIS PROGRAM.







EXHIBIT A

EXHIBIT A

MAINTAINERS

+1 −1
Original line number Original line Diff line number Diff line
@@ -7200,7 +7200,7 @@ S: Maintained 
F:	drivers/net/vmxnet3/

F:	drivers/net/vmxnet3/





VMware PVSCSI driver

VMware PVSCSI driver

M:	Alok Kataria <akataria@vmware.com>

M:	Arvind Kumar <arvindkumar@vmware.com>

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

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

L:	linux-scsi@vger.kernel.org

L:	linux-scsi@vger.kernel.org

S:	Maintained

S:	Maintained

drivers/scsi/Kconfig

+0 −5
Original line number Original line Diff line number Diff line
@@ -830,16 +830,11 @@ config SCSI_ISCI 
	tristate "Intel(R) C600 Series Chipset SAS Controller"

	tristate "Intel(R) C600 Series Chipset SAS Controller"

	depends on PCI && SCSI

	depends on PCI && SCSI

	depends on X86

	depends on X86

	# (temporary): known alpha quality driver

	depends on EXPERIMENTAL

	select SCSI_SAS_LIBSAS

	select SCSI_SAS_LIBSAS

	select SCSI_SAS_HOST_SMP

	---help---

	---help---

	  This driver supports the 6Gb/s SAS capabilities of the storage

	  This driver supports the 6Gb/s SAS capabilities of the storage

	  control unit found in the Intel(R) C600 series chipset.

	  control unit found in the Intel(R) C600 series chipset.





	  The experimental tag will be removed after the driver exits alpha



config SCSI_GENERIC_NCR5380

config SCSI_GENERIC_NCR5380

	tristate "Generic NCR5380/53c400 SCSI PIO support"

	tristate "Generic NCR5380/53c400 SCSI PIO support"

	depends on ISA && SCSI

	depends on ISA && SCSI

drivers/scsi/bfa/bfa_defs_svc.h

+1 −6
Original line number Original line Diff line number Diff line
@@ -673,12 +673,7 @@ struct bfa_itnim_iostats_s { 
	u32	tm_iocdowns;		/*  TM cleaned-up due to IOC down   */

	u32	tm_iocdowns;		/*  TM cleaned-up due to IOC down   */

	u32	tm_cleanups;		/*  TM cleanup requests	*/

	u32	tm_cleanups;		/*  TM cleanup requests	*/

	u32	tm_cleanup_comps;	/*  TM cleanup completions	*/

	u32	tm_cleanup_comps;	/*  TM cleanup completions	*/

	u32	lm_lun_across_sg;	/*  LM lun is across sg data buf */

	u32	rsvd[6];

	u32	lm_lun_not_sup;		/*  LM lun not supported */

	u32	lm_rpl_data_changed;	/*  LM report-lun data changed */

	u32	lm_wire_residue_changed; /* LM report-lun rsp residue changed */

	u32	lm_small_buf_addresidue; /* LM buf smaller than reported cnt */

	u32	lm_lun_not_rdy;		/* LM lun not ready */

};

};





/* Modify char* port_stt[] in bfal_port.c if a new state was added */

/* Modify char* port_stt[] in bfal_port.c if a new state was added */