Merge branch 'svn-trunk'

nightly/conf/nightly.conf

@@ -3,19 +3,19 @@
 ABT_DETAILS="x86_64"
 ABT_JOBS=5
 ABT_KERNELS="  \
-5.0.1          \
-4.20.15-nc     \
-4.19.28-nc     \
+5.0.2          \
+4.20.16-nc     \
+4.19.29-nc     \
 4.18.18-nc     \
 4.17.18-nc     \
 4.16.18-nc     \
 4.15.18-nc     \
-4.14.105-nc    \
+4.14.106-nc    \
 4.13.16-nc     \
 4.12.14-nc     \
 4.11.12-nc     \
 4.10.17-nc     \
-4.9.162-nc     \
+4.9.163-nc     \
 4.8.17-nc      \
 4.7.10-nc      \
 4.6.7-nc       \

scripts/generate-kernel-patch

@@ -219,7 +219,7 @@ else
 fi
 
 # Include fcst in the patch for kernel versions 2.6.33 and later.
-if kernel_version_le "2.6.33" "${kver}"; then
+if kernel_version_le "2.6.37" "${kver}"; then
   include_fcst="true"
 else
   include_fcst="false"

scst/include/backport.h

@@ -789,6 +789,15 @@ static inline long get_user_pages_backport(unsigned long start,
 })
 #endif
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 38)
+/*
+ * See also commit 16cb839f1332 ("include/linux/printk.h: add pr_<level>_once
+ * macros") # v2.6.38.
+ */
+#define pr_warn_once(fmt, ...)					\
+	printk_once(KERN_WARNING pr_fmt(fmt), ##__VA_ARGS__)
+#endif
+
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 35)
 /*
  * See also patch "kernel.h: add pr_warn for symmetry to dev_warn,