From: Greg Kroah-Hartman Date: Thu, 24 May 2018 14:20:56 +0000 (+0200) Subject: drop a scsi patch from 4.14 X-Git-Tag: v3.18.110~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c40541008b9352cd83d9703a8bce9b2cae914dba;p=thirdparty%2Fkernel%2Fstable-queue.git drop a scsi patch from 4.14 --- diff --git a/queue-4.14/scsi-core-make-scsi-status-condition-met-equivalent-to-good.patch b/queue-4.14/scsi-core-make-scsi-status-condition-met-equivalent-to-good.patch index 28a97a05ef1..6c79672742d 100644 --- a/queue-4.14/scsi-core-make-scsi-status-condition-met-equivalent-to-good.patch +++ b/queue-4.14/scsi-core-make-scsi-status-condition-met-equivalent-to-good.patch @@ -31,7 +31,7 @@ Signed-off-by: Greg Kroah-Hartman --- a/drivers/scsi/scsi_lib.c +++ b/drivers/scsi/scsi_lib.c -@@ -857,6 +857,17 @@ void scsi_io_completion(struct scsi_cmnd +@@ -855,6 +855,17 @@ void scsi_io_completion(struct scsi_cmnd /* for passthrough error may be set */ error = BLK_STS_OK; } diff --git a/queue-4.14/scsi-core-return-blk_sts_ok-for-did_ok-in-__scsi_error_from_host_byte.patch b/queue-4.14/scsi-core-return-blk_sts_ok-for-did_ok-in-__scsi_error_from_host_byte.patch deleted file mode 100644 index 4602b4f6014..00000000000 --- a/queue-4.14/scsi-core-return-blk_sts_ok-for-did_ok-in-__scsi_error_from_host_byte.patch +++ /dev/null @@ -1,34 +0,0 @@ -From foo@baz Thu May 24 11:09:34 CEST 2018 -From: Hannes Reinecke -Date: Mon, 26 Feb 2018 08:39:59 +0100 -Subject: scsi: core: return BLK_STS_OK for DID_OK in __scsi_error_from_host_byte() - -From: Hannes Reinecke - -[ Upstream commit e39a97353e5378eb46bf01679799c5704d397f32 ] - -When converting __scsi_error_from_host_byte() to BLK_STS error codes the -case DID_OK was forgotten, resulting in it always returning an error. - -Fixes: 2a842acab109 ("block: introduce new block status code type") -Cc: Doug Gilbert -Signed-off-by: Hannes Reinecke -Reviewed-by: Douglas Gilbert -Signed-off-by: Martin K. Petersen -Signed-off-by: Sasha Levin -Signed-off-by: Greg Kroah-Hartman ---- - drivers/scsi/scsi_lib.c | 2 ++ - 1 file changed, 2 insertions(+) - ---- a/drivers/scsi/scsi_lib.c -+++ b/drivers/scsi/scsi_lib.c -@@ -720,6 +720,8 @@ static blk_status_t __scsi_error_from_ho - int result) - { - switch (host_byte(result)) { -+ case DID_OK: -+ return BLK_STS_OK; - case DID_TRANSPORT_FAILFAST: - return BLK_STS_TRANSPORT; - case DID_TARGET_FAILURE: diff --git a/queue-4.14/series b/queue-4.14/series index 183cde33242..d86ca7ed6e9 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -107,7 +107,6 @@ scsi-storvsc-increase-cmd_per_lun-for-higher-speed-devices.patch scsi-qedi-fix-truncation-of-chap-name-and-secret.patch scsi-aacraid-fix-shutdown-crash-when-init-fails.patch scsi-qla4xxx-skip-error-recovery-in-case-of-register-disconnect.patch -scsi-core-return-blk_sts_ok-for-did_ok-in-__scsi_error_from_host_byte.patch scsi-qedi-fix-kernel-crash-during-port-toggle.patch scsi-mpt3sas-do-not-mark-fw_event-workqueue-as-wq_mem_reclaim.patch scsi-sd-keep-disk-read-only-when-re-reading-partition.patch