diff --git a/nightly/conf/nightly.conf b/nightly/conf/nightly.conf index 38b260159..a8ebd70b3 100644 --- a/nightly/conf/nightly.conf +++ b/nightly/conf/nightly.conf @@ -3,28 +3,29 @@ ABT_DETAILS="x86_64" ABT_JOBS=5 ABT_KERNELS=" \ -4.19.1 \ -4.18.16-nc \ +4.20.13 \ +4.19.26-nc \ +4.18.18-nc \ 4.17.18-nc \ 4.16.18-nc \ 4.15.18-nc \ -4.14.78-nc \ +4.14.104-nc \ 4.13.16-nc \ 4.12.14-nc \ 4.11.12-nc \ 4.10.17-nc \ -4.9.135-nc \ +4.9.161-nc \ 4.8.17-nc \ 4.7.10-nc \ 4.6.7-nc \ 4.5.7-nc \ -4.4.162-nc \ +4.4.176-nc \ 4.3.6-nc \ 4.2.8-nc \ 4.1.52-nc \ 4.0.9-nc \ 3.19.8-nc \ -3.18.124-nc \ +3.18.136-nc \ 3.17.8-nc \ 3.16.60-nc \ 3.15.10-nc \ @@ -55,5 +56,5 @@ ABT_KERNELS=" \ 2.6.31.14-nc \ 2.6.30.10-nc \ 2.6.29.6-nc \ -2.6.27.62-nc \ +2.6.27.52-nc \ " diff --git a/scripts/kernel-functions b/scripts/kernel-functions index c4fc92dd4..95b93044f 100644 --- a/scripts/kernel-functions +++ b/scripts/kernel-functions @@ -321,7 +321,7 @@ index d6d65537b0d9..6aad8308a0ac 100644 EOF fi case "$1" in - 3.19.*|4.[023567].*) + 3.[0-9].*|3.1[01345].*|3.17.*|3.19.*|4.[023567].*) patch -p1 <<'EOF' From c6a385539175ebc603da53aafb7753d39089f32e Mon Sep 17 00:00:00 2001 From: Borislav Petkov @@ -355,67 +355,30 @@ Cc: stable@vger.kernel.org Cc: Ben Hutchings Cc: Sebastian Andrzej Siewior Signed-off-by: Michal Marek +[ bvanassche: moved -fno-PIE to start of KBUILD_CFLAGS ] --- Makefile | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile -index 58fc5d935ce6..77ac3f88ec37 100644 +index 0ed6ce300543..c324b43712f0 100644 --- a/Makefile +++ b/Makefile -@@ -399,11 +399,12 @@ KBUILD_CFLAGS := -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs \ +@@ -378,7 +378,8 @@ LINUXINCLUDE := \ + + KBUILD_CPPFLAGS := -D__KERNEL__ + +-KBUILD_CFLAGS := -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs \ ++KBUILD_CFLAGS := $(call cc-option,-fno-PIE) \ ++ -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs \ -fno-strict-aliasing -fno-common \ -Werror-implicit-function-declaration \ -Wno-format-security \ -- -std=gnu89 -+ -std=gnu89 $(call cc-option,-fno-PIE) -+ +@@ -387,7 +388,7 @@ KBUILD_CFLAGS := -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs \ KBUILD_AFLAGS_KERNEL := KBUILD_CFLAGS_KERNEL := -KBUILD_AFLAGS := -D__ASSEMBLY__ -+KBUILD_AFLAGS := -D__ASSEMBLY__ $(call cc-option,-fno-PIE) - KBUILD_AFLAGS_MODULE := -DMODULE - KBUILD_CFLAGS_MODULE := -DMODULE - KBUILD_LDFLAGS_MODULE := -T $(srctree)/scripts/module-common.lds -EOF - ;; - 3.17.*) - patch -p1 <<'EOF' -diff --git a/Makefile b/Makefile -index 656f0b0cff53..82c569c05d18 100644 ---- a/Makefile -+++ b/Makefile -@@ -407,11 +407,11 @@ KBUILD_CPPFLAGS := -D__KERNEL__ - KBUILD_CFLAGS := -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs \ - -fno-strict-aliasing -fno-common \ - -Werror-implicit-function-declaration \ -- -Wno-format-security -+ -Wno-format-security $(call cc-option,-fno-PIE) - - KBUILD_AFLAGS_KERNEL := - KBUILD_CFLAGS_KERNEL := --KBUILD_AFLAGS := -D__ASSEMBLY__ -+KBUILD_AFLAGS := -D__ASSEMBLY__ $(call cc-option,-fno-PIE) - KBUILD_AFLAGS_MODULE := -DMODULE - KBUILD_CFLAGS_MODULE := -DMODULE - KBUILD_LDFLAGS_MODULE := -T $(srctree)/scripts/module-common.lds -EOF - ;; - 3.[0-9].*|3.1[01345].*) - patch -p1 <<'EOF' ---- linux-3.15/Makefile.orig 2019-02-28 19:10:25.026779069 +0100 -+++ linux-3.15/Makefile 2019-02-28 19:12:04.532860857 +0100 -@@ -395,11 +395,11 @@ - KBUILD_CFLAGS := -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs \ - -fno-strict-aliasing -fno-common \ - -Werror-implicit-function-declaration \ -- -Wno-format-security \ -+ -Wno-format-security $(call cc-option,-fno-PIE)\ - $(call cc-option,-fno-delete-null-pointer-checks,) - KBUILD_AFLAGS_KERNEL := - KBUILD_CFLAGS_KERNEL := --KBUILD_AFLAGS := -D__ASSEMBLY__ +KBUILD_AFLAGS := -D__ASSEMBLY__ $(call cc-option,-fno-PIE) KBUILD_AFLAGS_MODULE := -DMODULE KBUILD_CFLAGS_MODULE := -DMODULE diff --git a/scripts/specialize-patch b/scripts/specialize-patch index df45fb9fa..a4bf4e6f4 100755 --- a/scripts/specialize-patch +++ b/scripts/specialize-patch @@ -362,7 +362,6 @@ function handle_if(evaluated) || $0 ~ "IB_CM_LISTEN_TAKES_FOURTH_ARG" \ || $0 ~ "IB_CREATE_CQ_HAS_INIT_ATTR" \ || $0 ~ "IB_PD_HAS_LOCAL_DMA_LKEY" \ - || $0 ~ "IB_PD_HAS_LOCAL_DMA_LKEY" \ || $0 ~ "IB_QUERY_GID_HAS_ATTR_ARG" \ || $0 ~ "INSIDE_KERNEL_TREE" \ || $0 ~ "MAD_HANDLER_TAKES_SEND_BUF" \