summaryrefslogtreecommitdiff
path: root/drivers/scsi/qla2xxx
diff options
context:
space:
mode:
authorMartin K. Petersen <martin.petersen@oracle.com>2021-01-27 05:36:54 +0300
committerMartin K. Petersen <martin.petersen@oracle.com>2021-01-27 05:52:58 +0300
commit4d82e9db422ec34793650a34c5f03edd7b0abbaf (patch)
tree59a8eda6e6f11f6226c5910c6f41695b964ca03e /drivers/scsi/qla2xxx
parent18c05faf8ab14913c8144108661efa8f17b10b5b (diff)
parentaa2c24e7f415e9c13635cee22ff4e15a80215551 (diff)
downloadlinux-4d82e9db422ec34793650a34c5f03edd7b0abbaf.tar.xz
Merge branch '5.11/scsi-fixes' into 5.12/scsi-queue
The UFS core has received a substantial rework this cycle. This in turn has caused a merge conflict in linux-next. Merge 5.11/scsi-fixes into 5.12/scsi-queue and resolve the conflict. Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Diffstat (limited to 'drivers/scsi/qla2xxx')
-rw-r--r--drivers/scsi/qla2xxx/qla_os.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
index 89a7e47b9ff8..074392560f3d 100644
--- a/drivers/scsi/qla2xxx/qla_os.c
+++ b/drivers/scsi/qla2xxx/qla_os.c
@@ -42,7 +42,7 @@ MODULE_PARM_DESC(ql2xfulldump_on_mpifail,
int ql2xenforce_iocb_limit = 1;
module_param(ql2xenforce_iocb_limit, int, S_IRUGO | S_IWUSR);
MODULE_PARM_DESC(ql2xenforce_iocb_limit,
- "Enforce IOCB throttling, to avoid FW congestion. (default: 0)");
+ "Enforce IOCB throttling, to avoid FW congestion. (default: 1)");
/*
* CT6 CTX allocation cache