diff --git a/nightly/conf/nightly.conf b/nightly/conf/nightly.conf
index a38c7d438..43d9d3148 100644
--- a/nightly/conf/nightly.conf
+++ b/nightly/conf/nightly.conf
@@ -3,15 +3,15 @@
 ABT_DETAILS="x86_64"
 ABT_JOBS=5
 ABT_KERNELS="  \
-5.1.11          \
-5.0.20-nc      \
+5.1.12          \
+5.0.21-nc      \
 4.20.17-nc     \
-4.19.52-nc     \
+4.19.53-nc     \
 4.18.20-nc     \
 4.17.19-nc     \
 4.16.18-nc     \
 4.15.18-nc     \
-4.14.127-nc    \
+4.14.128-nc    \
 4.13.16-nc     \
 4.12.14-nc     \
 4.11.12-nc     \
@@ -27,9 +27,9 @@ ABT_KERNELS="  \
 4.1.52-nc      \
 4.0.9-nc       \
 3.19.8-nc      \
-3.18.139-nc    \
+3.18.140-nc    \
 3.17.8-nc      \
-3.16.66-nc     \
+3.16.69-nc     \
 3.15.10-nc     \
 3.14.79-nc     \
 3.13.11-nc     \
diff --git a/scst/include/backport.h b/scst/include/backport.h
index 0d18619a9..7588b5f33 100644
--- a/scst/include/backport.h
+++ b/scst/include/backport.h
@@ -1636,7 +1636,11 @@ enum {
 #define FC_PORT_ROLE_IP_PORT			0x04
 #endif
 
-#ifndef FC_PORT_ROLE_NVME_INITIATOR
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0)
+/*
+ * See also commit d6d20012e116 ("nvme-fabrics: Add FC transport LLDD api
+ * definitions") # v4.10.
+ */
 #define FC_PORT_ROLE_NVME_INITIATOR		0x10
 #define FC_PORT_ROLE_NVME_TARGET		0x20
 #define FC_PORT_ROLE_NVME_DISCOVERY		0x40