On Sat, Dec 14, 2019 at 04:04:15PM +0100, gregkh@xxxxxxxxxxxxxxxxxxx wrote:
The patch below does not apply to the 5.3-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable@xxxxxxxxxxxxxxx>. thanks, greg k-h ------------------ original commit in Linus's tree ------------------ From 71c80b75ce8f08c0978ce9a9816b81b5c3ce5e12 Mon Sep 17 00:00:00 2001 From: Quinn Tran <qutran@xxxxxxxxxxx> Date: Tue, 5 Nov 2019 07:06:51 -0800 Subject: [PATCH] scsi: qla2xxx: Do command completion on abort timeout On switch, fabric and mgt command timeout, driver send Abort to tell FW to return the original command. If abort is timeout, then return both Abort and original command for cleanup. Fixes: 219d27d7147e0 ("scsi: qla2xxx: Fix race conditions in the code for aborting SCSI commands") Cc: stable@xxxxxxxxxxxxxxx # 5.2 Link: https://lore.kernel.org/r/20191105150657.8092-3-hmadhani@xxxxxxxxxxx Reviewed-by: Ewan D. Milne <emilne@xxxxxxxxxx> Signed-off-by: Quinn Tran <qutran@xxxxxxxxxxx> Signed-off-by: Himanshu Madhani <hmadhani@xxxxxxxxxxx> Signed-off-by: Martin K. Petersen <martin.petersen@xxxxxxxxxx>
I took in this additional patch to resolve the conflict: 0c6df59061b2 ("scsi: qla2xxx: Fix abort timeout race condition.") -- Thanks, Sasha