From 09320f0f4d28c7902b9ce8c5d708f62742b0bcc1 Mon Sep 17 00:00:00 2001
From: Bart Van Assche <bvanassche@acm.org>
Date: Sat, 20 Apr 2019 16:37:39 +0000
Subject: [PATCH 1/2] qla2x00t-32gbit, target: Minimize #include directives

git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@8258 d57e44dd-8a1f-0410-8b47-8ef2f437770f
---
 qla2x00t-32gbit/qla2x00-target/scst_qla2xxx.c | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/qla2x00t-32gbit/qla2x00-target/scst_qla2xxx.c b/qla2x00t-32gbit/qla2x00-target/scst_qla2xxx.c
index d320fcb86..5d8305df2 100644
--- a/qla2x00t-32gbit/qla2x00-target/scst_qla2xxx.c
+++ b/qla2x00t-32gbit/qla2x00-target/scst_qla2xxx.c
@@ -40,14 +40,7 @@
 #define EXCLUDED 0
 
 #include <linux/module.h>
-#include <linux/init.h>
 #include <linux/types.h>
-#include <linux/version.h>
-#include <linux/blkdev.h>
-#include <linux/interrupt.h>
-#include <scsi/scsi.h>
-#include <scsi/scsi_host.h>
-#include <linux/pci.h>
 #include <linux/delay.h>
 #include <linux/list.h>
 #include <asm/unaligned.h>

From 01e8d4aadd50e38080c0fee49e03ed8602de9445 Mon Sep 17 00:00:00 2001
From: Bart Van Assche <bvanassche@acm.org>
Date: Sat, 20 Apr 2019 16:38:51 +0000
Subject: [PATCH 2/2] iscsi-scst, isert-scst: Make this driver build against
 RHEL 8

git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@8259 d57e44dd-8a1f-0410-8b47-8ef2f437770f
---
 iscsi-scst/kernel/isert-scst/iser_rdma.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/iscsi-scst/kernel/isert-scst/iser_rdma.c b/iscsi-scst/kernel/isert-scst/iser_rdma.c
index abeee79c2..69bc08be2 100644
--- a/iscsi-scst/kernel/isert-scst/iser_rdma.c
+++ b/iscsi-scst/kernel/isert-scst/iser_rdma.c
@@ -1295,7 +1295,8 @@ static struct isert_connection *isert_conn_create(struct rdma_cm_id *cm_id,
 	 * In mem-free devices, RC QPs can be created with a maximum of
 	 * (max_sge - 3) entries only.
 	 */
-#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 19, 0)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 19, 0) &&	\
+	(!defined(RHEL_MAJOR) || RHEL_MAJOR -0 < 8)
 	isert_conn->max_sge = isert_dev->device_attr.max_sge - 3;
 #else
 	isert_conn->max_sge = isert_dev->device_attr.max_recv_sge - 3;