Merge branch '6.9/s/lpfc2' into 6.10/s/lpfc

Pull in bug fix update from 6.9/scsi-fixes to accommodate 14.4.0.2
series.

Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>