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

Commit 052c220d 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 SCSI updates from James Bottomley:
 "This is mostly updates of the usual drivers: arcmsr, qla2xx, lpfc,
  ufs, mpt3sas, hisi_sas.

  In addition we have removed several really old drivers: sym53c416,
  NCR53c406a, fdomain, fdomain_cs and removed the old scsi_module.c
  initialization from all remaining drivers.

  Plus an assortment of bug fixes, initialization errors and other minor
  fixes"

* tag 'scsi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (168 commits)
  scsi: ufs: Add support for Auto-Hibernate Idle Timer
  scsi: ufs: sysfs: reworking of the rpm_lvl and spm_lvl entries
  scsi: qla2xxx: fx00 copypaste typo
  scsi: qla2xxx: fix error message on <qla2400
  scsi: smartpqi: update driver version
  scsi: smartpqi: workaround fw bug for oq deletion
  scsi: arcmsr: Change driver version to v1.40.00.05-20180309
  scsi: arcmsr: Sleep to avoid CPU stuck too long for waiting adapter ready
  scsi: arcmsr: Handle adapter removed due to thunderbolt cable disconnection.
  scsi: arcmsr: Rename ACB_F_BUS_HANG_ON to ACB_F_ADAPTER_REMOVED for adapter hot-plug
  scsi: qla2xxx: Update driver version to 10.00.00.06-k
  scsi: qla2xxx: Fix Async GPN_FT for FCP and FC-NVMe scan
  scsi: qla2xxx: Cleanup code to improve FC-NVMe error handling
  scsi: qla2xxx: Fix FC-NVMe IO abort during driver reset
  scsi: qla2xxx: Fix retry for PRLI RJT with reason of BUSY
  scsi: qla2xxx: Remove nvme_done_list
  scsi: qla2xxx: Return busy if rport going away
  scsi: qla2xxx: Fix n2n_ae flag to prevent dev_loss on PDB change
  scsi: qla2xxx: Add FC-NVMe abort processing
  scsi: qla2xxx: Add changes for devloss timeout in driver
  ...
parents 3526dd0c 2e1f44f6

Documentation/ABI/testing/sysfs-driver-ufs

0 → 100644
+885 −0

File added.

Preview size limit exceeded, changes collapsed.

Documentation/devicetree/bindings/scsi/hisilicon-sas.txt

+7 −0
Original line number Diff line number Diff line
@@ -53,6 +53,13 @@ Main node required properties: 
Optional main node properties:

 - hip06-sas-v2-quirk-amt : when set, indicates that the v2 controller has the

			    "am-max-transmissions" limitation.

 - hisilicon,signal-attenuation : array of 3 32-bit values, containing de-emphasis,

		preshoot, and boost attenuation readings for the board. They

		are used to describe the signal attenuation of the board. These

		values' range is 7600 to 12400, and used to represent -24dB to

		24dB.

		The formula is "y = (x-10000)/10000". For example, 10478

		means 4.78dB.



Example:

	sas0: sas@c1000000 {

Documentation/driver-api/scsi.rst

+0 −6
Original line number Diff line number Diff line
@@ -154,12 +154,6 @@ lists). 
.. kernel-doc:: drivers/scsi/scsi_lib_dma.c

   :export:



drivers/scsi/scsi_module.c

~~~~~~~~~~~~~~~~~~~~~~~~~~~



The file drivers/scsi/scsi_module.c contains legacy support for

old-style host templates. It should never be used by any new driver.



drivers/scsi/scsi_proc.c

~~~~~~~~~~~~~~~~~~~~~~~~~

Documentation/scsi/ChangeLog.1992-1997

deleted100644 → 0
+0 −2023

File deleted.

Preview size limit exceeded, changes collapsed.

Documentation/scsi/Mylex.txt

deleted100644 → 0
+0 −5
Original line number Diff line number Diff line 
Please see the file README.BusLogic for information about Linux support for

Mylex (formerly BusLogic) MultiMaster and FlashPoint SCSI Host Adapters.



The Mylex DAC960 PCI RAID Controllers are now supported.  Please consult

http://sourceforge.net/projects/dandelion for further information on the DAC960 driver.