From: Greg Kroah-Hartman Date: Thu, 15 Nov 2018 01:00:24 +0000 (-0800) Subject: drop broken scsi patch X-Git-Tag: v4.19.3~48 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ac4edb9e709580d7a5348f679bfa2748702b6ea4;p=thirdparty%2Fkernel%2Fstable-queue.git drop broken scsi patch --- diff --git a/queue-4.14/scsi-qla2xxx-reject-bsg-request-if-chip-is-down.patch b/queue-4.14/scsi-qla2xxx-reject-bsg-request-if-chip-is-down.patch deleted file mode 100644 index 58e83e03feb..00000000000 --- a/queue-4.14/scsi-qla2xxx-reject-bsg-request-if-chip-is-down.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 56d942de59ebfa2e970a6cd33299d1984710b6c0 Mon Sep 17 00:00:00 2001 -From: Quinn Tran -Date: Tue, 11 Sep 2018 10:18:22 -0700 -Subject: scsi: qla2xxx: Reject bsg request if chip is down. - -From: Quinn Tran - -commit 56d942de59ebfa2e970a6cd33299d1984710b6c0 upstream. - -Reject bsg request if chip is down. This prevent erroneous timeout. - -Fixes: d051a5aa1c23 ("[SCSI] qla2xxx: Add an "is reset active" helper.") -Cc: stable@vger.kernel.org # 4.10 -Signed-off-by: Quinn Tran -Signed-off-by: Himanshu Madhani -Signed-off-by: Martin K. Petersen -Signed-off-by: Greg Kroah-Hartman - ---- - drivers/scsi/qla2xxx/qla_bsg.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/drivers/scsi/qla2xxx/qla_bsg.c -+++ b/drivers/scsi/qla2xxx/qla_bsg.c -@@ -2492,7 +2492,7 @@ qla24xx_bsg_request(struct bsg_job *bsg_ - vha = shost_priv(host); - } - -- if (qla2x00_reset_active(vha)) { -+ if (qla2x00_chip_is_down(vha)) { - ql_dbg(ql_dbg_user, vha, 0x709f, - "BSG: ISP abort active/needed -- cmd=%d.\n", - bsg_request->msgcode); diff --git a/queue-4.14/series b/queue-4.14/series index 0c9ac9a0469..c09aa23abef 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -26,5 +26,4 @@ scsi-qla2xxx-fix-incorrect-port-speed-being-set-for-fc-adapters.patch scsi-qla2xxx-fix-process-response-queue-for-isp26xx-and-above.patch scsi-qla2xxx-remove-stale-debug-trace-message-from-tcm_qla2xxx.patch scsi-qla2xxx-shutdown-chip-if-reset-fail.patch -scsi-qla2xxx-reject-bsg-request-if-chip-is-down.patch scsi-qla2xxx-fix-re-using-loopid-when-handle-is-in-use.patch diff --git a/queue-4.18/scsi-qla2xxx-reject-bsg-request-if-chip-is-down.patch b/queue-4.18/scsi-qla2xxx-reject-bsg-request-if-chip-is-down.patch deleted file mode 100644 index 15f98660e86..00000000000 --- a/queue-4.18/scsi-qla2xxx-reject-bsg-request-if-chip-is-down.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 56d942de59ebfa2e970a6cd33299d1984710b6c0 Mon Sep 17 00:00:00 2001 -From: Quinn Tran -Date: Tue, 11 Sep 2018 10:18:22 -0700 -Subject: scsi: qla2xxx: Reject bsg request if chip is down. - -From: Quinn Tran - -commit 56d942de59ebfa2e970a6cd33299d1984710b6c0 upstream. - -Reject bsg request if chip is down. This prevent erroneous timeout. - -Fixes: d051a5aa1c23 ("[SCSI] qla2xxx: Add an "is reset active" helper.") -Cc: stable@vger.kernel.org # 4.10 -Signed-off-by: Quinn Tran -Signed-off-by: Himanshu Madhani -Signed-off-by: Martin K. Petersen -Signed-off-by: Greg Kroah-Hartman - ---- - drivers/scsi/qla2xxx/qla_bsg.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/drivers/scsi/qla2xxx/qla_bsg.c -+++ b/drivers/scsi/qla2xxx/qla_bsg.c -@@ -2487,7 +2487,7 @@ qla24xx_bsg_request(struct bsg_job *bsg_ - vha = shost_priv(host); - } - -- if (qla2x00_reset_active(vha)) { -+ if (qla2x00_chip_is_down(vha)) { - ql_dbg(ql_dbg_user, vha, 0x709f, - "BSG: ISP abort active/needed -- cmd=%d.\n", - bsg_request->msgcode); diff --git a/queue-4.18/series b/queue-4.18/series index 67b3dcd50cf..95f651e2f11 100644 --- a/queue-4.18/series +++ b/queue-4.18/series @@ -40,6 +40,5 @@ scsi-qla2xxx-fix-incorrect-port-speed-being-set-for-fc-adapters.patch scsi-qla2xxx-fix-process-response-queue-for-isp26xx-and-above.patch scsi-qla2xxx-remove-stale-debug-trace-message-from-tcm_qla2xxx.patch scsi-qla2xxx-shutdown-chip-if-reset-fail.patch -scsi-qla2xxx-reject-bsg-request-if-chip-is-down.patch scsi-qla2xxx-fix-re-using-loopid-when-handle-is-in-use.patch scsi-qla2xxx-fix-nvme-session-hang-on-unload.patch