Merge branch 'svn-trunk'

nightly/conf/nightly.conf

@@ -3,30 +3,31 @@
 ABT_DETAILS="x86_64"
 ABT_JOBS=5
 ABT_KERNELS="  \
-5.6.15         \
+5.7            \
+5.6.16-nc      \
 5.5.19-nc      \
-5.4.43-nc      \
+5.4.44-nc      \
 5.3.18-nc      \
 5.2.21-nc      \
 5.1.21-nc      \
 5.0.21-nc      \
 4.20.17-nc     \
-4.19.125-nc    \
+4.19.126-nc    \
 4.18.20-nc     \
 4.17.19-nc     \
 4.16.18-nc     \
 4.15.18-nc     \
-4.14.182-nc    \
+4.14.183-nc    \
 4.13.16-nc     \
 4.12.14-nc     \
 4.11.12-nc     \
 4.10.17-nc     \
-4.9.225-nc     \
+4.9.226-nc     \
 4.8.17-nc      \
 4.7.10-nc      \
 4.6.7-nc       \
 4.5.7-nc       \
-4.4.225-nc     \
+4.4.226-nc     \
 4.3.6-nc       \
 4.2.8-nc       \
 4.1.52-nc      \

scripts/kernel-functions

@@ -127,6 +127,31 @@ function extract_kernel_tree {
 
 # Patch a kernel tree where $1 is the kernel version.
 function patch_kernel {
+    case "$k" in
+	*^*)
+            # RHEL / CentOS.
+            ;;
+	2.*|3.*)
+            # Tell the kernel that we are using gcc 4.6 since older kernel
+            # versions do not support recent gcc versions.
+            KCFLAGS="-U__GNUC__ -U__GNUC_MINOR__ -D__GNUC__=4 -D__GNUC_MINOR__=6"
+	    patch -p1 <<'EOF'
+diff --git a/include/linux/compiler-gcc.h b/include/linux/compiler-gcc.h
+index 02ae99e8e6d3..47e12c19c965 100644
+--- a/include/linux/compiler-gcc.h
++++ b/include/linux/compiler-gcc.h
+@@ -103,7 +103,7 @@
+ #define __gcc_header(x) #x
+ #define _gcc_header(x) __gcc_header(linux/compiler-gcc##x.h)
+ #define gcc_header(x) _gcc_header(x)
+-#include gcc_header(__GNUC__)
++#include "linux/compiler-gcc4.h"
+ 
+ #if !defined(__noclone)
+ #define __noclone	/* not needed */
+EOF
+    esac
+
     if [ "$1" = "2.6.29" ] || [ "$1" = "2.6.29.1" ] || [ "$1" = "2.6.29.2" ] ||
 	   [ "$1" = "2.6.29.3" ]; then
       patch -f -s -p1 <<'EOF'

scripts/run-regression-tests

@@ -695,15 +695,6 @@ do
     run_checkpatch "$k"
   fi
   patch_and_configure_kernel "$k" || continue
-  case "$k" in
-      *^*)
-	  # CentOS.
-	  ;;
-      2.*|3.*)
-	  # Tell the kernel that we are using gcc 4.6 since older kernel
-	  # versions do not suppor recent gcc versions.
-	  KCFLAGS="-U__GNUC__ -U__GNUC_MINOR__ -D__GNUC__=4 -D__GNUC_MINOR__=6"
-  esac
   case "$k" in
       3.10.0-*)
 	  # Make the CentOS 7.x build less noisy.