tree 9ab4f369e72a6f1953f53269030bbba047c6be8a
parent ad448378825f5746c5fa37718724bc8f4e7b6945
parent 3f6c9be27ae1932410d0af044b074fd2c27945c4
author James Bottomley <James.Bottomley@HansenPartnership.com> 1522168054 -0400
committer James Bottomley <James.Bottomley@HansenPartnership.com> 1522802319 -0700

Merge branch 'fixes' into misc

Somewhat nasty merge due to conflicts between "33b28357dd00 scsi:
qla2xxx: Fix Async GPN_FT for FCP and FC-NVMe scan" and "2b5b96473efc
scsi: qla2xxx: Fix FC-NVMe LUN discovery"

Merge is non-trivial and has been verified by Qlogic (Cavium)

Signed-off-by: James E.J. Bottomley <jejb@linux.vnet.ibm.com>