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

Merge is non-trivial and has been verified by Qlogic (Cavium)
Signed-off-by: NJames E.J. Bottomley <jejb@linux.vnet.ibm.com>