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/qla2xxx/qla_gbl.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/qla2xxx/qla_gbl.h')
-rw-r--r-- | drivers/scsi/qla2xxx/qla_gbl.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/scsi/qla2xxx/qla_gbl.h b/drivers/scsi/qla2xxx/qla_gbl.h index 7bc2f634bab9..391c8b3623a6 100644 --- a/drivers/scsi/qla2xxx/qla_gbl.h +++ b/drivers/scsi/qla2xxx/qla_gbl.h @@ -192,6 +192,7 @@ extern int ql2xsecenable; extern int ql2xenforce_iocb_limit; extern int ql2xabts_wait_nvme; extern u32 ql2xnvme_queues; +extern int ql2xfc2target; extern int qla2x00_loop_reset(scsi_qla_host_t *); extern void qla2x00_abort_all_cmds(scsi_qla_host_t *, int); |