Commit 5f85942c 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 

Pull SCSI updates from James Bottomley:
 "This is mostly updates to the usual drivers: ufs, qedf, mpt3sas, lpfc,
  xfcp, hisi_sas, cxlflash, qla2xxx.

  In the absence of Nic, we're also taking target updates which are
  mostly minor except for the tcmu refactor.

  The only real core change to worry about is the removal of high page
  bouncing (in sas, storvsc and iscsi). This has been well tested and no
  problems have shown up so far"

* tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (268 commits)
  scsi: lpfc: update driver version to 12.0.0.4
  scsi: lpfc: Fix port initialization failure.
  scsi: lpfc: Fix 16gb hbas failing cq create.
  scsi: lpfc: Fix crash in blk_mq layer when executing modprobe -r lpfc
  scsi: lpfc: correct oversubscription of nvme io requests for an adapter
  scsi: lpfc: Fix MDS diagnostics failure (Rx < Tx)
  scsi: hisi_sas: Mark PHY as in reset for nexus reset
  scsi: hisi_sas: Fix return value when get_free_slot() failed
  scsi: hisi_sas: Terminate STP reject quickly for v2 hw
  scsi: hisi_sas: Add v2 hw force PHY function for internal ATA command
  scsi: hisi_sas: Include TMF elements in struct hisi_sas_slot
  scsi: hisi_sas: Try wait commands before before controller reset
  scsi: hisi_sas: Init disks after controller reset
  scsi: hisi_sas: Create a scsi_host_template per HW module
  scsi: hisi_sas: Reset disks when discovered
  scsi: hisi_sas: Add LED feature for v3 hw
  scsi: hisi_sas: Change common allocation mode of device id
  scsi: hisi_sas: change slot index allocation mode
  scsi: hisi_sas: Introduce hisi_sas_phy_set_linkrate()
  scsi: hisi_sas: fix a typo in hisi_sas_task_prep()
  ...
parents 0c14e43a 1b5c2cb1

Documentation/driver-api/index.rst

+1 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ available subsections can be seen below. 
   edac

   scsi

   libata

   target

   mtdnand

   miscellaneous

   w1

Documentation/driver-api/scsi.rst

+1 −1
Original line number Diff line number Diff line
@@ -334,5 +334,5 @@ todo 
~~~~



Parallel (fast/wide/ultra) SCSI, USB, SATA, SAS, Fibre Channel,

FireWire, ATAPI devices, Infiniband, I2O, iSCSI, Parallel ports,

FireWire, ATAPI devices, Infiniband, I2O, Parallel ports,

netlink...

Documentation/driver-api/target.rst

0 → 100644
+64 −0
Original line number Diff line number Diff line 
=================================

target and iSCSI Interfaces Guide

=================================



Introduction and Overview

=========================



TBD



Target core device interfaces

=============================



.. kernel-doc:: drivers/target/target_core_device.c

    :export:



Target core transport interfaces

================================



.. kernel-doc:: drivers/target/target_core_transport.c

    :export:



Target-supported userspace I/O

==============================



.. kernel-doc:: drivers/target/target_core_user.c

    :doc: Userspace I/O



.. kernel-doc:: include/uapi/linux/target_core_user.h

    :doc: Ring Design



iSCSI helper functions

======================



.. kernel-doc:: drivers/scsi/libiscsi.c

   :export:





iSCSI boot information

======================



.. kernel-doc:: drivers/scsi/iscsi_boot_sysfs.c

   :export:





iSCSI transport class

=====================



The file drivers/scsi/scsi_transport_iscsi.c defines transport

attributes for the iSCSI class, which sends SCSI packets over TCP/IP

connections.



.. kernel-doc:: drivers/scsi/scsi_transport_iscsi.c

   :export:





iSCSI TCP interfaces

====================



.. kernel-doc:: drivers/scsi/iscsi_tcp.c

   :internal:



.. kernel-doc:: drivers/scsi/libiscsi_tcp.c

   :export:

Documentation/ioctl/ioctl-number.txt

+1 −1
Original line number Diff line number Diff line
@@ -151,7 +151,7 @@ Code Seq#(hex) Include File Comments 
'J'	00-1F	drivers/scsi/gdth_ioctl.h

'K'	all	linux/kd.h

'L'	00-1F	linux/loop.h		conflict!

'L'	10-1F	drivers/scsi/mpt2sas/mpt2sas_ctl.h	conflict!

'L'	10-1F	drivers/scsi/mpt3sas/mpt3sas_ctl.h	conflict!

'L'	20-2F	linux/lightnvm.h

'L'	E0-FF	linux/ppdd.h		encrypted disk device driver

					<http://linux01.gwdg.de/~alatham/ppdd.html>

MAINTAINERS

+0 −1
Original line number Diff line number Diff line
@@ -8446,7 +8446,6 @@ L: linux-scsi@vger.kernel.org 
W:	http://www.avagotech.com/support/

S:	Supported

F:	drivers/message/fusion/

F:	drivers/scsi/mpt2sas/

F:	drivers/scsi/mpt3sas/



LSILOGIC/SYMBIOS/NCR 53C8XX and 53C1010 PCI-SCSI drivers

CRA Git | Maintained and supported by SUSTech CRA and CCSE