From 1e925eb0831881966919299121bad11958985eb6 Mon Sep 17 00:00:00 2001 From: Michal Kubecek Date: Feb 01 2021 16:04:00 +0000 Subject: Merge branch 'users/ematsumiya/SLE15-SP2/for-next' into SLE15-SP2 Pull a scsi fix from Enzo Matsumiya. --- diff --git a/patches.suse/scsi-qla2xxx-Fix-description-for-parameter-ql2xenfor.patch b/patches.suse/scsi-qla2xxx-Fix-description-for-parameter-ql2xenfor.patch new file mode 100644 index 0000000..dc7d631 --- /dev/null +++ b/patches.suse/scsi-qla2xxx-Fix-description-for-parameter-ql2xenfor.patch @@ -0,0 +1,36 @@ +From: Enzo Matsumiya +Date: Mon, 18 Jan 2021 15:49:22 -0300 +Subject: [PATCH] scsi: qla2xxx: Fix description for parameter + ql2xenforce_iocb_limit +Patch-mainline: v5.11-rc6 +Git-commit: aa2c24e7f415e9c13635cee22ff4e15a80215551 +References: bsc#1179142 + +Parameter ql2xenforce_iocb_limit is enabled by default. + +Link: https://lore.kernel.org/r/20210118184922.23793-1-ematsumiya@suse.de +Fixes: 89c72f4245a8 ("scsi: qla2xxx: Add IOCB resource tracking") +Reviewed-by: Daniel Wagner +Reviewed-by: Himanshu Madhani +Signed-off-by: Enzo Matsumiya +Signed-off-by: Martin K. Petersen +--- + drivers/scsi/qla2xxx/qla_os.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c +index f80abe28f35a..0e0fe5b09496 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 +-- +2.30.0 + diff --git a/series.conf b/series.conf index 50426f4..d7d12e4 100644 --- a/series.conf +++ b/series.conf @@ -17292,6 +17292,7 @@ patches.suse/PM-hibernate-flush-swap-writer-after-marking.patch patches.suse/nbd-freeze-the-queue-while-we-re-adding-connections.patch patches.suse/ACPI-IORT-Do-not-blindly-trust-DMA-masks-from-firmwa.patch + patches.suse/scsi-qla2xxx-Fix-description-for-parameter-ql2xenfor.patch patches.suse/leds-trigger-fix-potential-deadlock-with-libata.patch # jejb/scsi for-next