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 d7c57156061f991d7894b4a358c0bf582412f745..301b92f796c791ccc5b4c997e3a848b5d2056509 100644 (file)
--- 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 <gregkh@linuxfoundation.org>
 
 --- 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 1f64082022f6aa175c5787ce158bacc1404cb66a..c650d2a4156ceb1abd82a6f40449f8aa089c9a68 100644 (file)
--- 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 <gregkh@linuxfoundation.org>
  
        /* 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 04fa265d66b7c19773194b0c98a3cc8b1536e00c..97d942910c0a8156fbeb54bac6953b9a1015d77d 100644 (file)
--- 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 <gregkh@linuxfoundation.org>
 
 --- 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)