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

Commit 3151367f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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



Pull first round of SCSI updates from James Bottomley:
 "This is a large set of updates, mostly for drivers (qla2xxx [including
  support for new 83xx based card], qla4xxx, mpt2sas, bfa, zfcp, hpsa,
  be2iscsi, isci, lpfc, ipr, ibmvfc, ibmvscsi, megaraid_sas).

  There's also a rework for tape adding virtually unlimited numbers of
  tape drives plus a set of dif fixes for sd and a fix for a live lock
  on hot remove of SCSI devices.

  This round includes a signed tag pull of isci-for-3.6

  Signed-off-by: default avatarJames Bottomley <JBottomley@Parallels.com&gt;">

Fix up trivial conflict in drivers/scsi/qla2xxx/qla_nx.c due to new PCI
helper function use in a function that was removed by this pull.

* tag 'scsi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (198 commits)
  [SCSI] st: remove st_mutex
  [SCSI] sd: Ensure we correctly disable devices with unknown protection type
  [SCSI] hpsa: gen8plus Smart Array IDs
  [SCSI] qla4xxx: Update driver version to 5.03.00-k1
  [SCSI] qla4xxx: Disable generating pause frames for ISP83XX
  [SCSI] qla4xxx: Fix double clearing of risc_intr for ISP83XX
  [SCSI] qla4xxx: IDC implementation for Loopback
  [SCSI] qla4xxx: update copyrights in LICENSE.qla4xxx
  [SCSI] qla4xxx: Fix panic while rmmod
  [SCSI] qla4xxx: Fail probe_adapter if IRQ allocation fails
  [SCSI] qla4xxx: Prevent MSI/MSI-X falling back to INTx for ISP82XX
  [SCSI] qla4xxx: Update idc reg in case of PCI AER
  [SCSI] qla4xxx: Fix double IDC locking in qla4_8xxx_error_recovery
  [SCSI] qla4xxx: Clear interrupt while unloading driver for ISP83XX
  [SCSI] qla4xxx: Print correct IDC version
  [SCSI] qla4xxx: Added new mbox cmd to pass driver version to FW
  [SCSI] scsi_dh_alua: Enable STPG for unavailable ports
  [SCSI] scsi_remove_target: fix softlockup regression on hot remove
  [SCSI] ibmvscsi: Fix host config length field overflow
  [SCSI] ibmvscsi: Remove backend abstraction
  ...
parents 16642a2e fe709ed8

Documentation/kernel-parameters.txt

+3 −0
Original line number Diff line number Diff line
@@ -1350,6 +1350,9 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 
			* nohrst, nosrst, norst: suppress hard, soft

                          and both resets.



			* rstonce: only attempt one reset during

			  hot-unplug link recovery



			* dump_id: dump IDENTIFY data.



			If there are multiple matching configurations changing

Documentation/scsi/ChangeLog.megaraid_sas

+10 −0
Original line number Diff line number Diff line 
Release Date    : Tue. Jun 17, 2012 17:00:00 PST 2012 -

			(emaild-id:megaraidlinux@lsi.com)

			Adam Radford/Kashyap Desai

Current Version : 00.00.06.18-rc1

Old Version     : 00.00.06.15-rc1

    1. Fix Copyright dates.

    2. Add throttlequeuedepth module parameter.

    3. Add resetwaittime module parameter.

    4. Move poll_aen_lock initializer.

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

Release Date    : Mon. Mar 19, 2012 17:00:00 PST 2012 -

			(emaild-id:megaraidlinux@lsi.com)

			Adam Radford

Documentation/scsi/LICENSE.qla2xxx

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

Copyright (c) 2003-2012 QLogic Corporation

QLogic Linux FC-FCoE Driver



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

Documentation/scsi/LICENSE.qla4xxx

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

Copyright (c) 2003-2012 QLogic Corporation

QLogic Linux iSCSI Driver



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

Documentation/scsi/st.txt

+2 −4
Original line number Diff line number Diff line
@@ -112,10 +112,8 @@ attempted). 


MINOR NUMBERS



The tape driver currently supports 128 drives by default. This number

can be increased by editing st.h and recompiling the driver if

necessary. The upper limit is 2^17 drives if 4 modes for each drive

are used.

The tape driver currently supports up to 2^17 drives if 4 modes for

each drive are used.



The minor numbers consist of the following bit fields: