From 34b4ac48ed1980493a61123f3b0339d773bd767d Mon Sep 17 00:00:00 2001
From: Bart Van Assche <bvanassche@acm.org>
Date: Sun, 5 Sep 2021 03:11:34 +0000
Subject: [PATCH 1/2] qla2x00t: Fix three kernel-doc headers

git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@9511 d57e44dd-8a1f-0410-8b47-8ef2f437770f
---
 qla2x00t/qla_gs.c   | 4 ++--
 qla2x00t/qla_iocb.c | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/qla2x00t/qla_gs.c b/qla2x00t/qla_gs.c
index 4eedcec98..ec763533d 100644
--- a/qla2x00t/qla_gs.c
+++ b/qla2x00t/qla_gs.c
@@ -1015,7 +1015,7 @@ qla2x00_sns_gnn_id(scsi_qla_host_t *vha, sw_info_t *list)
 }
 
 /**
- * qla2x00_snd_rft_id() - SNS Register FC-4 TYPEs (RFT_ID) supported by the HBA.
+ * qla2x00_sns_rft_id() - SNS Register FC-4 TYPEs (RFT_ID) supported by the HBA.
  * @vha: HA context
  *
  * This command uses the old Exectute SNS Command mailbox routine.
@@ -1251,7 +1251,7 @@ qla2x00_update_ms_fdmi_iocb(scsi_qla_host_t *vha, uint32_t req_size)
 }
 
 /**
- * qla2x00_prep_ct_req() - Prepare common CT request fields for SNS query.
+ * qla2x00_prep_ct_fdmi_req() - Prepare common CT request fields for SNS query.
  * @p: CT request buffer
  * @cmd: GS command
  * @rsp_size: response size in bytes
diff --git a/qla2x00t/qla_iocb.c b/qla2x00t/qla_iocb.c
index 528094ca0..ae0f8ba0f 100644
--- a/qla2x00t/qla_iocb.c
+++ b/qla2x00t/qla_iocb.c
@@ -504,7 +504,7 @@ qla2x00_start_iocbs(struct scsi_qla_host *vha, struct req_que *req)
 EXPORT_SYMBOL(qla2x00_start_iocbs);
 
 /**
- * qla2x00_marker() - Send a marker IOCB to the firmware.
+ * __qla2x00_marker() - Send a marker IOCB to the firmware.
  * @vha: HA context
  * @req: Request queue
  * @rsp: ...

From db29b3330dc60f7a23bccb87751690348d18401d Mon Sep 17 00:00:00 2001
From: Bart Van Assche <bvanassche@acm.org>
Date: Sun, 5 Sep 2021 03:14:00 +0000
Subject: [PATCH 2/2] qla2x00t-32gbit: Bump the minimum kernel version to v3.18

Patches that will be applied later for this driver require kernel version
v3.18.


git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@9512 d57e44dd-8a1f-0410-8b47-8ef2f437770f
---
 qla2x00t-32gbit/qla_def.h     | 2 +-
 scripts/generate-kernel-patch | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/qla2x00t-32gbit/qla_def.h b/qla2x00t-32gbit/qla_def.h
index 29d588ead..74245aa79 100644
--- a/qla2x00t-32gbit/qla_def.h
+++ b/qla2x00t-32gbit/qla_def.h
@@ -54,7 +54,7 @@
 	(!defined(RHEL_MAJOR) || RHEL_MAJOR -0 < 7)
 #error
 #error ***This version of qla2xxx does not support distributions based on***
-#error ***kernels before Linux kernel v3.15.***
+#error ***kernels before Linux kernel v3.18.***
 #error
 #endif
 
diff --git a/scripts/generate-kernel-patch b/scripts/generate-kernel-patch
index c8c4e551e..a6a8e3d4b 100755
--- a/scripts/generate-kernel-patch
+++ b/scripts/generate-kernel-patch
@@ -248,7 +248,7 @@ fi
 
 # See also commit 89d9a567952b ("[SCSI] add support for per-host cmd pools";
 # v3.15).
-if kernel_version_lt "$kver" 3.15; then
+if kernel_version_lt "$kver" 3.18; then
     qla2x00t="true"
     qla2x00t_32gbit="false"
 else