From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 22 Jun 2019 16:39:03 +0000 (-0700)
Subject: Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=f4102766463a66026bd4af6c30cbbd01f10e6c42;p=linux.git

Merge tag 'scsi-fixes' of git://git./linux/kernel/git/jejb/scsi

Pull SCSI fixes from James Bottomley:
 "Three driver fixes (and one version number update): a suspend hang in
  ufs, a qla hard lock on module removal and a qedi panic during
  discovery"

* tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
  scsi: qla2xxx: Fix hardlockup in abort command during driver remove
  scsi: ufs: Avoid runtime suspend possibly being blocked forever
  scsi: qedi: update driver version to 8.37.0.20
  scsi: qedi: Check targetname while finding boot target information
---

f4102766463a66026bd4af6c30cbbd01f10e6c42
diff --cc drivers/scsi/qedi/qedi_version.h
index f56f0ba0c4a80,2c17544c77858..0ac1055bd4205
--- a/drivers/scsi/qedi/qedi_version.h
+++ b/drivers/scsi/qedi/qedi_version.h
@@@ -2,10 -1,14 +2,10 @@@
  /*
   * QLogic iSCSI Offload Driver
   * Copyright (c) 2016 Cavium Inc.
 - *
 - * This software is available under the terms of the GNU General Public License
 - * (GPL) Version 2, available from the file COPYING in the main directory of
 - * this source tree.
   */
  
- #define QEDI_MODULE_VERSION	"8.33.0.21"
+ #define QEDI_MODULE_VERSION	"8.37.0.20"
  #define QEDI_DRIVER_MAJOR_VER		8
- #define QEDI_DRIVER_MINOR_VER		33
+ #define QEDI_DRIVER_MINOR_VER		37
  #define QEDI_DRIVER_REV_VER		0
- #define QEDI_DRIVER_ENG_VER		21
+ #define QEDI_DRIVER_ENG_VER		20