drop scsi-sg-fix-sg_dxfer_from_dev-transfers.patch from 4.12

diff --git a/queue-4.12/scsi-sg-fix-sg_dxfer_from_dev-transfers.patch b/queue-4.12/scsi-sg-fix-sg_dxfer_from_dev-transfers.patch
deleted file mode 100644 (file)
index f18b509..0000000
--- a/queue-4.12/scsi-sg-fix-sg_dxfer_from_dev-transfers.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 68c59fcea1f2c6a54c62aa896cc623c1b5bc9b47 Mon Sep 17 00:00:00 2001
-From: Johannes Thumshirn <jthumshirn@suse.de>
-Date: Fri, 7 Jul 2017 10:56:38 +0200
-Subject: scsi: sg: fix SG_DXFER_FROM_DEV transfers
-
-From: Johannes Thumshirn <jthumshirn@suse.de>
-
-commit 68c59fcea1f2c6a54c62aa896cc623c1b5bc9b47 upstream.
-
-SG_DXFER_FROM_DEV transfers do not necessarily have a dxferp as we set
-it to NULL for the old sg_io read/write interface, but must have a
-length bigger than 0. This fixes a regression introduced by commit
-28676d869bbb ("scsi: sg: check for valid direction before starting the
-request")
-
-Signed-off-by: Johannes Thumshirn <jthumshirn@suse.de>
-Fixes: 28676d869bbb ("scsi: sg: check for valid direction before starting the request")
-Reported-by: Chris Clayton <chris2553@googlemail.com>
-Tested-by: Chris Clayton <chris2553@googlemail.com>
-Cc: Douglas Gilbert <dgilbert@interlog.com>
-Reviewed-by: Hannes Reinecke <hare@suse.com>
-Tested-by: Chris Clayton <chris2553@googlemail.com>
-Acked-by: Douglas Gilbert <dgilbert@interlog.com>
-Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/scsi/sg.c |    5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
---- a/drivers/scsi/sg.c
-+++ b/drivers/scsi/sg.c
-@@ -758,8 +758,11 @@ static bool sg_is_valid_dxfer(sg_io_hdr_
-               if (hp->dxferp || hp->dxfer_len > 0)
-                       return false;
-               return true;
--      case SG_DXFER_TO_DEV:
-       case SG_DXFER_FROM_DEV:
-+              if (hp->dxfer_len < 0)
-+                      return false;
-+              return true;
-+      case SG_DXFER_TO_DEV:
-       case SG_DXFER_TO_FROM_DEV:
-               if (!hp->dxferp || hp->dxfer_len == 0)
-                       return false;

diff --git a/queue-4.12/series b/queue-4.12/series
index e1e19c9af341cd58ef385d55eeb7279e426bb4e9..914e583bd754e39fded8bbbc414457233299c4d5 100644 (file)
--- a/queue-4.12/series
+++ b/queue-4.12/series
@@ -1,7 +1,6 @@
 parisc-increase-thread-and-stack-size-to-32kb.patch
 parisc-handle-vma-s-whose-context-is-not-current-in-flush_cache_range.patch
 scsi-lpfc-fix-linking-against-modular-nvme-support.patch
-scsi-sg-fix-sg_dxfer_from_dev-transfers.patch
 acpi-lpss-only-call-pwm_add_table-for-the-first-pwm-controller.patch
 cgroup-don-t-call-migration-methods-if-there-are-no-tasks-to-migrate.patch
 cgroup-create-dfl_root-files-on-subsys-registration.patch