From 6d4d2d9d3d8525fc5ab3101ba4cb04581cffa321 Mon Sep 17 00:00:00 2001
From: Bart Van Assche <bvanassche@acm.org>
Date: Sun, 24 Oct 2021 02:35:10 +0000
Subject: [PATCH 1/2] nightly build: Update kernel versions

git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@9585 d57e44dd-8a1f-0410-8b47-8ef2f437770f
---
 nightly/conf/nightly.conf | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/nightly/conf/nightly.conf b/nightly/conf/nightly.conf
index 63f4932c3..7ec413e03 100644
--- a/nightly/conf/nightly.conf
+++ b/nightly/conf/nightly.conf
@@ -3,38 +3,38 @@
 ABT_DETAILS="x86_64"
 ABT_JOBS=5
 ABT_KERNELS="  \
-5.14.10        \
+5.14.14        \
 5.13.19-nc     \
 5.12.19-nc     \
 5.11.22-nc     \
-5.10.71-nc     \
+5.10.75-nc     \
 5.9.16-nc      \
 5.8.18-nc      \
 5.7.19-nc      \
 5.6.19-nc      \
 5.5.19-nc      \
-5.4.151-nc     \
+5.4.155-nc     \
 5.3.18-nc      \
 5.2.21-nc      \
 5.1.21-nc      \
 5.0.21-nc      \
 4.20.17-nc     \
-4.19.209-nc    \
+4.19.213-nc    \
 4.18.20-nc     \
 4.17.19-nc     \
 4.16.18-nc     \
 4.15.18-nc     \
-4.14.246-nc    \
+4.14.252-nc    \
 4.13.16-nc     \
 4.12.14-nc     \
 4.11.12-nc     \
 4.10.17-nc     \
-4.9.285-nc     \
+4.9.287-nc     \
 4.8.17-nc      \
 4.7.10-nc      \
 4.6.7-nc       \
 4.5.7-nc       \
-4.4.287-nc     \
+4.4.289-nc     \
 4.3.6-nc       \
 4.2.8-nc       \
 4.1.52-nc      \
@@ -59,7 +59,7 @@ ABT_KERNELS="  \
 3.10.0-1062.18.1.el7^CentOS^7.7.1908-nc	\
 3.10.0-957.27.2.el7^CentOS^7.6.1810-nc	\
 3.10.0-862.14.4.el7^CentOS^7.5.1804-nc	\
-5.4.17-2102.200.13.el8uek^UEK^8-nc      \
+5.4.17-2136.300.7.el8uek^UEK^8-nc       \
 5.4.17-2036.101.2.el7uek^UEK^7-nc	\
 4.14.35-2025.403.3.el7uek^UEK^7-nc	\
 "

From a8711755b5f77c8db36c34a384f8c19ba52d36c1 Mon Sep 17 00:00:00 2001
From: Bart Van Assche <bvanassche@acm.org>
Date: Sun, 24 Oct 2021 02:37:31 +0000
Subject: [PATCH 2/2] fcst: Fix the build against the latest UEK kernel

This patch fixes the build against UEK kernel 5.4.17-2136.300.7.el8uek and
breaks the build for older 5.4.17 UEK kernels, e.g.
5.4.17-2102.200.13.el8uek.


git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@9586 d57e44dd-8a1f-0410-8b47-8ef2f437770f
---
 fcst/ft_cmd.c | 4 +++-
 fcst/ft_io.c  | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/fcst/ft_cmd.c b/fcst/ft_cmd.c
index a072fe814..d2dc37e8c 100644
--- a/fcst/ft_cmd.c
+++ b/fcst/ft_cmd.c
@@ -19,7 +19,9 @@
 #include <linux/kernel.h>
 #include <linux/types.h>
 #include <scsi/libfc.h>
-#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 11, 0)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 11, 0) &&		\
+	!(LINUX_VERSION_CODE == KERNEL_VERSION(5, 4, 7) &&	\
+	  defined(UEK_KABI_RENAME))
 #include <scsi/fc_encode.h>
 #else
 #include <scsi/fc/fc_ms.h>
diff --git a/fcst/ft_io.c b/fcst/ft_io.c
index b1de814d2..c17a6df2d 100644
--- a/fcst/ft_io.c
+++ b/fcst/ft_io.c
@@ -24,7 +24,9 @@
 #include <linux/kernel.h>
 #include <linux/types.h>
 #include <scsi/libfc.h>
-#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 11, 0)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 11, 0) &&		\
+	!(LINUX_VERSION_CODE == KERNEL_VERSION(5, 4, 7) &&	\
+	  defined(UEK_KABI_RENAME))
 #include <scsi/fc_encode.h>
 #else
 #include <scsi/fc/fc_ms.h>