Merge branch 'svn-trunk'

nightly/conf/nightly.conf

@@ -3,7 +3,9 @@
 ABT_DETAILS="x86_64"
 ABT_JOBS=5
 ABT_KERNELS="  \
-4.15.18	       \
+4.17.6	       \
+4.16.18-nc     \
+4.15.18-nc     \
 4.14.52-nc     \
 4.13.16-nc     \
 4.12.14-nc     \

scripts/specialize-patch

@@ -90,9 +90,15 @@ function evaluate(stmnt, pattern, arg, op, result) {
   gsub("RDMA_CREATE_ID_TAKES_NET_ARG",
        "(LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 0))", stmnt)
 
+  gsub("HAVE_DEV_ATTR_MAX_SEND_SGE",
+       "(LINUX_VERSION_CODE >= KERNEL_VERSION(4, 19, 0))", stmnt)
+
   gsub("HAVE_RDMA_DESTROY_AH",
        "(LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0))", stmnt)
   
+  gsub("HAVE_RDMA_QUERY_GID",
+       "(LINUX_VERSION_CODE >= KERNEL_VERSION(4, 19, 0))", stmnt)
+
   gsub("HAVE_STRUCT_SRP_LOGIN_REQ_RDMA",
        "(LINUX_VERSION_CODE >= KERNEL_VERSION(4, 16, 0))", stmnt)
 
@@ -337,13 +343,16 @@ function handle_if(evaluated)
   # kernel version, and do not interpret other expressions.
   if ($0 ~ "LINUX_VERSION_CODE"    \
       || $0 ~ "CONFIG_SCST_PROC"   \
+      || $0 ~ "CONFIG_SCST_STRICT_SERIALIZING" \
       || $0 ~ "CREATE_SEND_MAD_HAS_BASE_ARG"   \
       || $0 ~ "ENABLE_NPIV" \
       || $0 ~ "FC_VPORT_CREATE_DEFINED" \
+      || $0 ~ "HAVE_DEV_ATTR_MAX_SEND_SGE" \
       || $0 ~ "HAVE_IB_DMA_MAP_OPS" \
       || $0 ~ "HAVE_IB_QUERY_DEVICE" \
       || $0 ~ "HAVE_IB_SET_CPI_RESP_TIME" \
       || $0 ~ "HAVE_RDMA_DESTROY_AH" \
+      || $0 ~ "HAVE_RDMA_QUERY_GID" \
       || $0 ~ "HAVE_STRUCT_SRP_LOGIN_REQ_RDMA" \
       || $0 ~ "IB_CLIENT_REMOVE_TAKES_TWO_ARGS" \
       || $0 ~ "IB_CM_LISTEN_TAKES_FOURTH_ARG" \
@@ -353,7 +362,6 @@ function handle_if(evaluated)
       || $0 ~ "IB_QUERY_GID_HAS_ATTR_ARG" \
       || $0 ~ "INSIDE_KERNEL_TREE" \
       || $0 ~ "MAD_HANDLER_TAKES_SEND_BUF" \
-      || $0 ~ "CONFIG_SCST_STRICT_SERIALIZING" \
       || $0 ~ "RDMA_CREATE_ID_TAKES_NET_ARG" \
       || $0 ~ "REGISTER_MAD_AGENT_HAS_FLAGS_ARG" \
       || $0 ~ "RHEL_MAJOR"         \

scst/src/dev_handlers/scst_vdisk.c

@@ -4142,7 +4142,9 @@ static int vdisk_usn_vpd(uint8_t *buf, struct scst_cmd *cmd,
 		usn_len = strlen(virt_dev->usn);
 		buf[3] = usn_len;
 #pragma GCC diagnostic push
+#if __GNUC__ -0 >= 8
 #pragma GCC diagnostic ignored "-Wstringop-truncation"
+#endif
 		strncpy(&buf[4], virt_dev->usn, usn_len);
 #pragma GCC diagnostic pop
 		read_unlock(&vdisk_serial_rwlock);