diff options
author | Martin K. Petersen <martin.petersen@oracle.com> | 2023-03-31 21:45:14 -0400 |
---|---|---|
committer | Martin K. Petersen <martin.petersen@oracle.com> | 2023-03-31 21:45:14 -0400 |
commit | f467b865cf5b25aac3feee3fb5e25b90f5df35c4 (patch) | |
tree | ee99dbe821c841c979152486537420f13286d3f4 /drivers/scsi/snic/snic_res.h | |
parent | 882f4adac9a8411ba9993810132add18896b82c1 (diff) | |
parent | d684a7a26f7d2c7122a4581ac966ed64e88fb29c (diff) | |
download | linux-stable-f467b865cf5b25aac3feee3fb5e25b90f5df35c4.tar.gz linux-stable-f467b865cf5b25aac3feee3fb5e25b90f5df35c4.tar.bz2 linux-stable-f467b865cf5b25aac3feee3fb5e25b90f5df35c4.zip |
Merge branch '6.3/scsi-fixes' into 6.4/scsi-staging
Pull in the fixes branch to resolve an mpi3mr conflict reported by
sfr.
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Diffstat (limited to 'drivers/scsi/snic/snic_res.h')
0 files changed, 0 insertions, 0 deletions