From 8d3ef1aed2f5d23c5418b7e474a5bc794ce5de9b Mon Sep 17 00:00:00 2001
From: Bart Van Assche <bvanassche@acm.org>
Date: Sun, 14 Jul 2019 21:27:59 +0000
Subject: [PATCH 1/2] qla2x00t-32gbit: Minimize diffs with the upstream qla2xxx
 driver

git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@8446 d57e44dd-8a1f-0410-8b47-8ef2f437770f
---
 qla2x00t-32gbit/qla_nvme.c | 2 +-
 qla2x00t-32gbit/qla_nvme.h | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/qla2x00t-32gbit/qla_nvme.c b/qla2x00t-32gbit/qla_nvme.c
index 7518a35c6..05b6170ad 100644
--- a/qla2x00t-32gbit/qla_nvme.c
+++ b/qla2x00t-32gbit/qla_nvme.c
@@ -9,11 +9,11 @@
 
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 10, 0)
 
+#include "qla_nvme.h"
 #include <linux/scatterlist.h>
 #include <linux/delay.h>
 #include <linux/nvme.h>
 #include <linux/nvme-fc.h>
-#include "qla_nvme.h"
 
 static struct nvme_fc_port_template qla_nvme_fc_transport;
 
diff --git a/qla2x00t-32gbit/qla_nvme.h b/qla2x00t-32gbit/qla_nvme.h
index 21a6c257a..b98aded69 100644
--- a/qla2x00t-32gbit/qla_nvme.h
+++ b/qla2x00t-32gbit/qla_nvme.h
@@ -10,6 +10,7 @@
 #include <scsi/fc/fc_fs.h>
 #include <scsi/fc/fc_els.h>
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 10, 0)
+#include <linux/scatterlist.h>
 #include <linux/nvme-fc-driver.h>
 #endif
 

From 780b8392479a4122b169f8e270717ab1c6f9b83f Mon Sep 17 00:00:00 2001
From: Bart Van Assche <bvanassche@acm.org>
Date: Sun, 14 Jul 2019 21:29:38 +0000
Subject: [PATCH 2/2] qla2x00t-32gbit: Minimize the diffs with the upstream
 code

git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@8447 d57e44dd-8a1f-0410-8b47-8ef2f437770f
---
 qla2x00t-32gbit/qla_nvme.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/qla2x00t-32gbit/qla_nvme.c b/qla2x00t-32gbit/qla_nvme.c
index 05b6170ad..6e10f6ee0 100644
--- a/qla2x00t-32gbit/qla_nvme.c
+++ b/qla2x00t-32gbit/qla_nvme.c
@@ -558,7 +558,6 @@ static void qla_nvme_remoteport_delete(struct nvme_fc_remote_port *rport)
 	fcport = qla_rport->fcport;
 	fcport->nvme_remote_port = NULL;
 	fcport->nvme_flag &= ~NVME_FLAG_REGISTERED;
-
 	list_for_each_entry_safe(qla_rport, trport,
 	    &fcport->vha->nvme_rport_list, list) {
 		if (qla_rport->fcport == fcport) {