From: Greg Kroah-Hartman Date: Wed, 14 Mar 2018 07:52:23 +0000 (+0100) Subject: 4.14 refresh X-Git-Tag: v4.14.27~2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=696213769142f02330bf4754e2871f60403d0d89;p=thirdparty%2Fkernel%2Fstable-queue.git 4.14 refresh --- diff --git a/queue-4.14/scsi-qla2xxx-fix-null-pointer-crash-due-to-active-timer-for-abts.patch b/queue-4.14/scsi-qla2xxx-fix-null-pointer-crash-due-to-active-timer-for-abts.patch index d7c57156061..301b92f796c 100644 --- a/queue-4.14/scsi-qla2xxx-fix-null-pointer-crash-due-to-active-timer-for-abts.patch +++ b/queue-4.14/scsi-qla2xxx-fix-null-pointer-crash-due-to-active-timer-for-abts.patch @@ -110,7 +110,7 @@ Signed-off-by: Greg Kroah-Hartman --- a/drivers/scsi/qla2xxx/qla_init.c +++ b/drivers/scsi/qla2xxx/qla_init.c -@@ -1348,6 +1348,7 @@ qla24xx_abort_sp_done(void *ptr, int res +@@ -1357,6 +1357,7 @@ qla24xx_abort_sp_done(void *ptr, int res srb_t *sp = ptr; struct srb_iocb *abt = &sp->u.iocb_cmd; diff --git a/queue-4.14/scsi-qla2xxx-fix-null-pointer-crash-due-to-probe-failure.patch b/queue-4.14/scsi-qla2xxx-fix-null-pointer-crash-due-to-probe-failure.patch index 1f64082022f..c650d2a4156 100644 --- a/queue-4.14/scsi-qla2xxx-fix-null-pointer-crash-due-to-probe-failure.patch +++ b/queue-4.14/scsi-qla2xxx-fix-null-pointer-crash-due-to-probe-failure.patch @@ -56,7 +56,7 @@ Signed-off-by: Greg Kroah-Hartman /* Alloc arrays of request and response ring ptrs */ if (!qla2x00_alloc_queues(ha, req, rsp)) { -@@ -3374,6 +3371,9 @@ probe_failed: +@@ -3375,6 +3372,9 @@ probe_failed: scsi_host_put(base_vha->host); probe_hw_failed: diff --git a/queue-4.14/scsi-qla2xxx-fix-recursion-while-sending-terminate-exchange.patch b/queue-4.14/scsi-qla2xxx-fix-recursion-while-sending-terminate-exchange.patch index 04fa265d66b..97d942910c0 100644 --- a/queue-4.14/scsi-qla2xxx-fix-recursion-while-sending-terminate-exchange.patch +++ b/queue-4.14/scsi-qla2xxx-fix-recursion-while-sending-terminate-exchange.patch @@ -33,7 +33,7 @@ Signed-off-by: Greg Kroah-Hartman --- a/drivers/scsi/qla2xxx/qla_target.c +++ b/drivers/scsi/qla2xxx/qla_target.c -@@ -3708,7 +3708,7 @@ static int qlt_term_ctio_exchange(struct +@@ -3711,7 +3711,7 @@ static int qlt_term_ctio_exchange(struct term = 1; if (term)