James Bottomley 2e1f44f6ad 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>
2018-04-03 17:38:39 -07:00
..
2017-10-19 12:46:43 +01:00
2017-03-13 15:33:09 -07:00
2018-02-27 21:19:13 -05:00
2018-01-02 13:59:16 -05:00
2017-03-13 15:33:09 -07:00
2018-04-03 17:38:39 -07:00
2018-02-13 21:37:00 -05:00
2018-01-02 13:59:16 -05:00
2018-04-03 17:38:39 -07:00
2017-08-24 22:28:50 -04:00