mirror of
https://github.com/torvalds/linux.git
synced 2024-09-30 03:43:17 +00:00
ba6d10ab80
This is mostly update of the usual drivers: qla2xxx, hpsa, lpfc, ufs,
mpt3sas, ibmvscsi, megaraid_sas, bnx2fc and hisi_sas as well as the
removal of the osst driver (I heard from Willem privately that he
would like the driver removed because all his test hardware has
failed). Plus number of minor changes, spelling fixes and other
trivia.
Signed-off-by: James E.J. Bottomley <jejb@linux.ibm.com>
-----BEGIN PGP SIGNATURE-----
iJwEABMIAEQWIQTnYEDbdso9F2cI+arnQslM7pishQUCXSTl4yYcamFtZXMuYm90
dG9tbGV5QGhhbnNlbnBhcnRuZXJzaGlwLmNvbQAKCRDnQslM7pishdcxAQDCJVbd
fPUX76/V1ldupunF97+3DTharxxbst+VnkOnCwD8D4c0KFFFOI9+F36cnMGCPegE
fjy17dQLvsJ4GsidHy8=
=aS5B
-----END PGP SIGNATURE-----
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 update of the usual drivers: qla2xxx, hpsa, lpfc, ufs,
mpt3sas, ibmvscsi, megaraid_sas, bnx2fc and hisi_sas as well as the
removal of the osst driver (I heard from Willem privately that he
would like the driver removed because all his test hardware has
failed). Plus number of minor changes, spelling fixes and other
trivia.
The big merge conflict this time around is the SPDX licence tags.
Following discussion on linux-next, we believe our version to be more
accurate than the one in the tree, so the resolution is to take our
version for all the SPDX conflicts"
Note on the SPDX license tag conversion conflicts: the SCSI tree had
done its own SPDX conversion, which in some cases conflicted with the
treewide ones done by Thomas & co.
In almost all cases, the conflicts were purely syntactic: the SCSI tree
used the old-style SPDX tags ("GPL-2.0" and "GPL-2.0+") while the
treewide conversion had used the new-style ones ("GPL-2.0-only" and
"GPL-2.0-or-later").
In these cases I picked the new-style one.
In a few cases, the SPDX conversion was actually different, though. As
explained by James above, and in more detail in a pre-pull-request
thread:
"The other problem is actually substantive: In the libsas code Luben
Tuikov originally specified gpl 2.0 only by dint of stating:
* This file is licensed under GPLv2.
In all the libsas files, but then muddied the water by quoting GPLv2
verbatim (which includes the or later than language). So for these
files Christoph did the conversion to v2 only SPDX tags and Thomas
converted to v2 or later tags"
So in those cases, where the spdx tag substantially mattered, I took the
SCSI tree conversion of it, but then also took the opportunity to turn
the old-style "GPL-2.0" into a new-style "GPL-2.0-only" tag.
Similarly, when there were whitespace differences or other differences
to the comments around the copyright notices, I took the version from
the SCSI tree as being the more specific conversion.
Finally, in the spdx conversions that had no conflicts (because the
treewide ones hadn't been done for those files), I just took the SCSI
tree version as-is, even if it was old-style. The old-style conversions
are perfectly valid, even if the "-only" and "-or-later" versions are
perhaps more descriptive.
* tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (185 commits)
scsi: qla2xxx: move IO flush to the front of NVME rport unregistration
scsi: qla2xxx: Fix NVME cmd and LS cmd timeout race condition
scsi: qla2xxx: on session delete, return nvme cmd
scsi: qla2xxx: Fix kernel crash after disconnecting NVMe devices
scsi: megaraid_sas: Update driver version to 07.710.06.00-rc1
scsi: megaraid_sas: Introduce various Aero performance modes
scsi: megaraid_sas: Use high IOPS queues based on IO workload
scsi: megaraid_sas: Set affinity for high IOPS reply queues
scsi: megaraid_sas: Enable coalescing for high IOPS queues
scsi: megaraid_sas: Add support for High IOPS queues
scsi: megaraid_sas: Add support for MPI toolbox commands
scsi: megaraid_sas: Offload Aero RAID5/6 division calculations to driver
scsi: megaraid_sas: RAID1 PCI bandwidth limit algorithm is applicable for only Ventura
scsi: megaraid_sas: megaraid_sas: Add check for count returned by HOST_DEVICE_LIST DCMD
scsi: megaraid_sas: Handle sequence JBOD map failure at driver level
scsi: megaraid_sas: Don't send FPIO to RL Bypass queue
scsi: megaraid_sas: In probe context, retry IOC INIT once if firmware is in fault
scsi: megaraid_sas: Release Mutex lock before OCR in case of DCMD timeout
scsi: megaraid_sas: Call disable_irq from process IRQ poll
scsi: megaraid_sas: Remove few debug counters from IO path
...
86 lines
2.4 KiB
Plaintext
86 lines
2.4 KiB
Plaintext
# SPDX-License-Identifier: GPL-2.0-only
|
|
#
|
|
# PCMCIA SCSI adapter configuration
|
|
#
|
|
|
|
menuconfig SCSI_LOWLEVEL_PCMCIA
|
|
bool "PCMCIA SCSI adapter support"
|
|
depends on SCSI!=n && PCMCIA!=n
|
|
|
|
# drivers have problems when build in, so require modules
|
|
if SCSI_LOWLEVEL_PCMCIA && SCSI && PCMCIA && m
|
|
|
|
config PCMCIA_AHA152X
|
|
tristate "Adaptec AHA152X PCMCIA support"
|
|
select SCSI_SPI_ATTRS
|
|
help
|
|
Say Y here if you intend to attach this type of PCMCIA SCSI host
|
|
adapter to your computer.
|
|
|
|
To compile this driver as a module, choose M here: the
|
|
module will be called aha152x_cs.
|
|
|
|
config PCMCIA_FDOMAIN
|
|
tristate "Future Domain PCMCIA support"
|
|
select SCSI_FDOMAIN
|
|
help
|
|
Say Y here if you intend to attach this type of PCMCIA SCSI host
|
|
adapter to your computer.
|
|
|
|
To compile this driver as a module, choose M here: the
|
|
module will be called fdomain_cs.
|
|
|
|
config PCMCIA_NINJA_SCSI
|
|
tristate "NinjaSCSI-3 / NinjaSCSI-32Bi (16bit) PCMCIA support"
|
|
depends on !64BIT
|
|
help
|
|
If you intend to attach this type of PCMCIA SCSI host adapter to
|
|
your computer, say Y here and read
|
|
<file:Documentation/scsi/NinjaSCSI.txt>.
|
|
|
|
Supported cards:
|
|
|
|
NinjaSCSI-3: (version string: "WBT","NinjaSCSI-3","R1.0")
|
|
IO-DATA PCSC-FP
|
|
ALPHA DATA AD-PCS201
|
|
CyQ've SFC-201
|
|
LOGITECH LPM-SCSI2E
|
|
Pioneer PCR-PR24's card
|
|
I-O DATA CDPS-PX24's card (PCSC-F)
|
|
Panasonic KXL-RW10AN CD-RW's card
|
|
etc.
|
|
|
|
NinjaSCSI-32Bit (in 16bit mode):
|
|
[Workbit (version string: "WORKBIT","UltraNinja-16","1")]
|
|
Jazz SCP050
|
|
[I-O DATA (OEM) (version string: "IO DATA","CBSC16 ","1")]
|
|
I-O DATA CBSC-II
|
|
[Kyusyu Matsushita Kotobuki (OEM)
|
|
(version string: "KME ","SCSI-CARD-001","1")]
|
|
KME KXL-820AN's card
|
|
HP M820e CDRW's card
|
|
etc.
|
|
|
|
To compile this driver as a module, choose M here: the
|
|
module will be called nsp_cs.
|
|
|
|
config PCMCIA_QLOGIC
|
|
tristate "Qlogic PCMCIA support"
|
|
help
|
|
Say Y here if you intend to attach this type of PCMCIA SCSI host
|
|
adapter to your computer.
|
|
|
|
To compile this driver as a module, choose M here: the
|
|
module will be called qlogic_cs.
|
|
|
|
config PCMCIA_SYM53C500
|
|
tristate "Symbios 53c500 PCMCIA support"
|
|
help
|
|
Say Y here if you have a New Media Bus Toaster or other PCMCIA
|
|
SCSI adapter based on the Symbios 53c500 controller.
|
|
|
|
To compile this driver as a module, choose M here: the
|
|
module will be called sym53c500_cs.
|
|
|
|
endif # SCSI_LOWLEVEL_PCMCIA
|