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
  ...

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/infiniband/ulp/srp/ib_srp.c
Simple merge

diff --cc drivers/scsi/Kconfig
Simple merge

diff --cc drivers/scsi/aic94xx/aic94xx_dev.c
Simple merge

diff --cc drivers/scsi/cxgbi/cxgb4i/cxgb4i.c
Simple merge

diff --cc drivers/scsi/hisi_sas/hisi_sas.h
Simple merge

diff --cc drivers/scsi/hisi_sas/hisi_sas_main.c
Simple merge

diff --cc drivers/scsi/hisi_sas/hisi_sas_v2_hw.c
Simple merge

diff --cc drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
Simple merge

diff --cc drivers/scsi/hpsa.c
Simple merge

diff --cc drivers/scsi/hpsa_cmd.h
Simple merge

diff --cc drivers/scsi/ibmvscsi/ibmvscsi.c
Simple merge

diff --cc drivers/scsi/ibmvscsi/ibmvscsi.h
Simple merge

diff --cc drivers/scsi/libiscsi_tcp.c
Simple merge

diff --cc drivers/scsi/libsas/sas_expander.c
Simple merge

diff --cc drivers/scsi/libsas/sas_init.c
index d50810d,8f26089..21c43b1
--- 1/drivers/scsi/libsas/sas_init.c
--- 2/drivers/scsi/libsas/sas_init.c
+++ b/drivers/scsi/libsas/sas_init.c
@@@ -1,4 -1,4 +1,4 @@@
- // SPDX-License-Identifier: GPL-2.0-or-later
 -// SPDX-License-Identifier: GPL-2.0
++// SPDX-License-Identifier: GPL-2.0-only
  /*
   * Serial Attached SCSI (SAS) Transport Layer initialization
   *

diff --cc drivers/scsi/libsas/sas_internal.h
index 1f1e07e,1bc248a..01f1738
--- 1/drivers/scsi/libsas/sas_internal.h
--- 2/drivers/scsi/libsas/sas_internal.h
+++ b/drivers/scsi/libsas/sas_internal.h
@@@ -1,4 -1,4 +1,4 @@@
- /* SPDX-License-Identifier: GPL-2.0-or-later */
 -/* SPDX-License-Identifier: GPL-2.0 */
++/* SPDX-License-Identifier: GPL-2.0-only */
  /*
   * Serial Attached SCSI (SAS) class internal header file
   *

diff --cc drivers/scsi/libsas/sas_phy.c
Simple merge

diff --cc drivers/scsi/libsas/sas_scsi_host.c
index ede0674,602bd1a..4f339f9
--- 1/drivers/scsi/libsas/sas_scsi_host.c
--- 2/drivers/scsi/libsas/sas_scsi_host.c
+++ b/drivers/scsi/libsas/sas_scsi_host.c
@@@ -1,4 -1,4 +1,4 @@@
- // SPDX-License-Identifier: GPL-2.0-or-later
 -// SPDX-License-Identifier: GPL-2.0
++// SPDX-License-Identifier: GPL-2.0-only
  /*
   * Serial Attached SCSI (SAS) class SCSI Host glue.
   *

diff --cc drivers/scsi/lpfc/lpfc_attr.c
Simple merge

diff --cc drivers/scsi/lpfc/lpfc_crtn.h
Simple merge

diff --cc drivers/scsi/lpfc/lpfc_els.c
Simple merge

diff --cc drivers/scsi/lpfc/lpfc_nvme.c
Simple merge

diff --cc drivers/scsi/lpfc/lpfc_nvmet.c
Simple merge

diff --cc drivers/scsi/lpfc/lpfc_sli.c
Simple merge

diff --cc drivers/scsi/mac_scsi.c
Simple merge

diff --cc drivers/scsi/megaraid/Kconfig.megaraid
Simple merge

diff --cc drivers/scsi/megaraid/megaraid_sas.h
Simple merge

diff --cc drivers/scsi/megaraid/megaraid_sas_base.c
Simple merge

diff --cc drivers/scsi/megaraid/megaraid_sas_fp.c
Simple merge

diff --cc drivers/scsi/megaraid/megaraid_sas_fusion.c
Simple merge

diff --cc drivers/scsi/megaraid/megaraid_sas_fusion.h
Simple merge

diff --cc drivers/scsi/mvsas/mv_sas.c
Simple merge

diff --cc drivers/scsi/mvsas/mv_sas.h
Simple merge

diff --cc drivers/scsi/pcmcia/Kconfig
Simple merge

diff --cc drivers/scsi/qla2xxx/qla_os.c
Simple merge

diff --cc drivers/scsi/qla2xxx/qla_target.c
Simple merge

diff --cc drivers/scsi/scsi.c
Simple merge

diff --cc drivers/scsi/scsi_error.c
Simple merge

diff --cc drivers/scsi/scsi_lib.c
Simple merge

diff --cc drivers/scsi/scsi_pm.c
Simple merge

diff --cc drivers/scsi/scsi_sysfs.c
Simple merge

diff --cc drivers/scsi/scsi_transport_fc.c
Simple merge

diff --cc drivers/scsi/sd.c
Simple merge

diff --cc drivers/scsi/ses.c
Simple merge

diff --cc drivers/scsi/st.c
Simple merge

diff --cc drivers/scsi/storvsc_drv.c
Simple merge

diff --cc drivers/scsi/ufs/ufs-qcom.c
index b4d1b5c,61a5c6e..ee4b1da
--- 1/drivers/scsi/ufs/ufs-qcom.c
--- 2/drivers/scsi/ufs/ufs-qcom.c
+++ b/drivers/scsi/ufs/ufs-qcom.c
@@@ -1,8 -1,18 +1,9 @@@
 +// SPDX-License-Identifier: GPL-2.0-only
  /*
   * Copyright (c) 2013-2016, Linux Foundation. All rights reserved.
 - *
 - * This program is free software; you can redistribute it and/or modify
 - * it under the terms of the GNU General Public License version 2 and
 - * only version 2 as published by the Free Software Foundation.
 - *
 - * This program is distributed in the hope that it will be useful,
 - * but WITHOUT ANY WARRANTY; without even the implied warranty of
 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 - * GNU General Public License for more details.
 - *
   */
  
+ #include <linux/acpi.h>
  #include <linux/time.h>
  #include <linux/of.h>
  #include <linux/platform_device.h>

diff --cc drivers/scsi/ufs/ufshcd.c
Simple merge

diff --cc drivers/scsi/virtio_scsi.c
Simple merge

diff --cc drivers/scsi/wd719x.c
Simple merge

diff --cc drivers/target/iscsi/iscsi_target_nego.c
Simple merge

diff --cc drivers/target/target_core_user.c
Simple merge

diff --cc include/scsi/fc/fc_ms.h
index b1424dc,78c82e4..800d53d
--- 1/include/scsi/fc/fc_ms.h
--- 2/include/scsi/fc/fc_ms.h
+++ b/include/scsi/fc/fc_ms.h
@@@ -1,5 -1,6 +1,6 @@@
 -/* SPDX-License-Identifier: GPL-2.0 */
 +/* SPDX-License-Identifier: GPL-2.0-only */
- /* * Copyright(c) 2011 Intel Corporation. All rights reserved.
+ /*
+  * Copyright(c) 2011 Intel Corporation. All rights reserved.
   *
   * Maintained at www.Open-FCoE.org
   */

diff --cc include/scsi/iscsi_if.h
Simple merge

diff --cc include/scsi/iscsi_proto.h
Simple merge

diff --cc include/scsi/libiscsi_tcp.h
Simple merge

diff --cc include/scsi/libsas.h
index e9664bb,a8565a8..4e2d61e
--- 1/include/scsi/libsas.h
--- 2/include/scsi/libsas.h
+++ b/include/scsi/libsas.h
@@@ -1,4 -1,4 +1,4 @@@
- /* SPDX-License-Identifier: GPL-2.0-or-later */
 -/* SPDX-License-Identifier: GPL-2.0 */
++/* SPDX-License-Identifier: GPL-2.0-only */
  /*
   * SAS host prototypes and structures header file
   *

diff --cc include/scsi/sas.h
index 97a0f6b,ded4d6b..a5d8ae4
--- 1/include/scsi/sas.h
--- 2/include/scsi/sas.h
+++ b/include/scsi/sas.h
@@@ -1,4 -1,4 +1,4 @@@
- /* SPDX-License-Identifier: GPL-2.0-or-later */
 -/* SPDX-License-Identifier: GPL-2.0 */
++/* SPDX-License-Identifier: GPL-2.0-only */
  /*
   * SAS structures and definitions header file
   *

diff --cc include/scsi/scsi_transport.h
index 0580dce,a0643b9..a0458bd
--- 1/include/scsi/scsi_transport.h
--- 2/include/scsi/scsi_transport.h
+++ b/include/scsi/scsi_transport.h
@@@ -1,4 -1,4 +1,4 @@@
- /* SPDX-License-Identifier: GPL-2.0-or-later */
 -/* SPDX-License-Identifier: GPL-2.0 */
++/* SPDX-License-Identifier: GPL-2.0-only */
  /* 
   *  Transport specific attributes.
   *

diff --cc include/scsi/scsi_transport_fc.h
Simple merge