From: Martin K. Petersen <martin.petersen@oracle.com>
Date: Thu, 7 Jul 2022 21:20:43 +0000 (-0400)
Subject: Merge branch '5.19/scsi-fixes' into 5.20/scsi-staging
X-Git-Tag: v6.0-rc1~114^2~67
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=11e50ed239b5b7f383874dd737283ae93f62ece3;p=thirdparty%2Flinux.git

Merge branch '5.19/scsi-fixes' into 5.20/scsi-staging

Bring in fixes to resolve a merge conflict in the lpfc driver update.

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

11e50ed239b5b7f383874dd737283ae93f62ece3