From bf0b23e3a4943c10e28b2f40cbfef0a1c278d0f6 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Wed, 31 Oct 2018 13:11:02 -0500 Subject: [PATCH] Linux v4.19-11807-g310c7585e830 --- ...-Fix-ERROR-__node_distance-undefined.patch | 32 +++++++++++++++++++ .../generic/CONFIG_PROC_VMCORE_DEVICE_DUMP | 2 +- gitrev | 2 +- kernel-aarch64-debug.config | 2 +- kernel-aarch64.config | 2 +- kernel-armv7hl-debug.config | 2 +- kernel-armv7hl-lpae-debug.config | 2 +- kernel-armv7hl-lpae.config | 2 +- kernel-armv7hl.config | 2 +- kernel-i686-debug.config | 2 +- kernel-i686.config | 2 +- kernel-ppc64le-debug.config | 2 +- kernel-ppc64le.config | 2 +- kernel-s390x-debug.config | 2 +- kernel-s390x.config | 2 +- kernel-x86_64-debug.config | 2 +- kernel-x86_64.config | 2 +- kernel.spec | 8 ++++- sources | 2 +- 19 files changed, 56 insertions(+), 18 deletions(-) create mode 100644 0001-s390-mm-Fix-ERROR-__node_distance-undefined.patch diff --git a/0001-s390-mm-Fix-ERROR-__node_distance-undefined.patch b/0001-s390-mm-Fix-ERROR-__node_distance-undefined.patch new file mode 100644 index 000000000..f35d94341 --- /dev/null +++ b/0001-s390-mm-Fix-ERROR-__node_distance-undefined.patch @@ -0,0 +1,32 @@ +From e94355905793eef85567e723feb43b72c98e8a83 Mon Sep 17 00:00:00 2001 +From: "Justin M. Forbes" +Date: Wed, 31 Oct 2018 11:56:22 -0500 +Subject: [PATCH] s390/mm: Fix ERROR: "__node_distance" undefined! + +Fixes: +ERROR: "__node_distance" [drivers/nvme/host/nvme-core.ko] undefined! +make[1]: *** [scripts/Makefile.modpost:92: __modpost] Error 1 +make: *** [Makefile:1275: modules] Error 2 ++ exit 1 + +Signed-off-by: Justin M. Forbes +--- + arch/s390/numa/numa.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/arch/s390/numa/numa.c b/arch/s390/numa/numa.c +index 5bd374491f94..bef306e45da8 100644 +--- a/arch/s390/numa/numa.c ++++ b/arch/s390/numa/numa.c +@@ -55,6 +55,8 @@ int __node_distance(int a, int b) + return mode->distance ? mode->distance(a, b) : 0; + } + ++EXPORT_SYMBOL(__node_distance); ++ + int numa_debug_enabled; + + /* +-- +2.19.1 + diff --git a/configs/fedora/generic/CONFIG_PROC_VMCORE_DEVICE_DUMP b/configs/fedora/generic/CONFIG_PROC_VMCORE_DEVICE_DUMP index fdcc41f6f..1a63c6ae7 100644 --- a/configs/fedora/generic/CONFIG_PROC_VMCORE_DEVICE_DUMP +++ b/configs/fedora/generic/CONFIG_PROC_VMCORE_DEVICE_DUMP @@ -1 +1 @@ -# CONFIG_PROC_VMCORE_DEVICE_DUMP is not set +CONFIG_PROC_VMCORE_DEVICE_DUMP=y diff --git a/gitrev b/gitrev index 9e89def85..6fb1f2e0c 100644 --- a/gitrev +++ b/gitrev @@ -1 +1 @@ -11743c56785c751c087eecdb98713eef796609e0 +310c7585e8300ddc46211df0757c11e4299ec482 diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config index c9dc8408e..f6c0eca85 100644 --- a/kernel-aarch64-debug.config +++ b/kernel-aarch64-debug.config @@ -4621,7 +4621,7 @@ CONFIG_PROC_EVENTS=y CONFIG_PROC_FS=y CONFIG_PROC_KCORE=y CONFIG_PROC_PID_CPUSET=y -# CONFIG_PROC_VMCORE_DEVICE_DUMP is not set +CONFIG_PROC_VMCORE_DEVICE_DUMP=y CONFIG_PROC_VMCORE=y # CONFIG_PROFILE_ANNOTATED_BRANCHES is not set CONFIG_PROFILING=y diff --git a/kernel-aarch64.config b/kernel-aarch64.config index 5f2b04d89..7a868294b 100644 --- a/kernel-aarch64.config +++ b/kernel-aarch64.config @@ -4599,7 +4599,7 @@ CONFIG_PROC_EVENTS=y CONFIG_PROC_FS=y CONFIG_PROC_KCORE=y CONFIG_PROC_PID_CPUSET=y -# CONFIG_PROC_VMCORE_DEVICE_DUMP is not set +CONFIG_PROC_VMCORE_DEVICE_DUMP=y CONFIG_PROC_VMCORE=y # CONFIG_PROFILE_ANNOTATED_BRANCHES is not set CONFIG_PROFILING=y diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config index ecdf04a95..84b507183 100644 --- a/kernel-armv7hl-debug.config +++ b/kernel-armv7hl-debug.config @@ -4885,7 +4885,7 @@ CONFIG_PROC_EVENTS=y CONFIG_PROC_FS=y CONFIG_PROC_KCORE=y CONFIG_PROC_PID_CPUSET=y -# CONFIG_PROC_VMCORE_DEVICE_DUMP is not set +CONFIG_PROC_VMCORE_DEVICE_DUMP=y CONFIG_PROC_VMCORE=y # CONFIG_PROFILE_ANNOTATED_BRANCHES is not set CONFIG_PROFILING=y diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config index e8f9dabc2..d7364e212 100644 --- a/kernel-armv7hl-lpae-debug.config +++ b/kernel-armv7hl-lpae-debug.config @@ -4642,7 +4642,7 @@ CONFIG_PROC_EVENTS=y CONFIG_PROC_FS=y CONFIG_PROC_KCORE=y CONFIG_PROC_PID_CPUSET=y -# CONFIG_PROC_VMCORE_DEVICE_DUMP is not set +CONFIG_PROC_VMCORE_DEVICE_DUMP=y CONFIG_PROC_VMCORE=y # CONFIG_PROFILE_ANNOTATED_BRANCHES is not set CONFIG_PROFILING=y diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config index 79e9ac9e4..c55e49caf 100644 --- a/kernel-armv7hl-lpae.config +++ b/kernel-armv7hl-lpae.config @@ -4620,7 +4620,7 @@ CONFIG_PROC_EVENTS=y CONFIG_PROC_FS=y CONFIG_PROC_KCORE=y CONFIG_PROC_PID_CPUSET=y -# CONFIG_PROC_VMCORE_DEVICE_DUMP is not set +CONFIG_PROC_VMCORE_DEVICE_DUMP=y CONFIG_PROC_VMCORE=y # CONFIG_PROFILE_ANNOTATED_BRANCHES is not set CONFIG_PROFILING=y diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config index 02344ab2b..50e558ab5 100644 --- a/kernel-armv7hl.config +++ b/kernel-armv7hl.config @@ -4863,7 +4863,7 @@ CONFIG_PROC_EVENTS=y CONFIG_PROC_FS=y CONFIG_PROC_KCORE=y CONFIG_PROC_PID_CPUSET=y -# CONFIG_PROC_VMCORE_DEVICE_DUMP is not set +CONFIG_PROC_VMCORE_DEVICE_DUMP=y CONFIG_PROC_VMCORE=y # CONFIG_PROFILE_ANNOTATED_BRANCHES is not set CONFIG_PROFILING=y diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config index ed26ab43e..6ba8c68bb 100644 --- a/kernel-i686-debug.config +++ b/kernel-i686-debug.config @@ -4410,7 +4410,7 @@ CONFIG_PROC_EVENTS=y CONFIG_PROC_FS=y CONFIG_PROC_KCORE=y CONFIG_PROC_PID_CPUSET=y -# CONFIG_PROC_VMCORE_DEVICE_DUMP is not set +CONFIG_PROC_VMCORE_DEVICE_DUMP=y CONFIG_PROC_VMCORE=y # CONFIG_PROFILE_ANNOTATED_BRANCHES is not set CONFIG_PROFILING=y diff --git a/kernel-i686.config b/kernel-i686.config index 794ea511e..31f833ef9 100644 --- a/kernel-i686.config +++ b/kernel-i686.config @@ -4387,7 +4387,7 @@ CONFIG_PROC_EVENTS=y CONFIG_PROC_FS=y CONFIG_PROC_KCORE=y CONFIG_PROC_PID_CPUSET=y -# CONFIG_PROC_VMCORE_DEVICE_DUMP is not set +CONFIG_PROC_VMCORE_DEVICE_DUMP=y CONFIG_PROC_VMCORE=y # CONFIG_PROFILE_ANNOTATED_BRANCHES is not set CONFIG_PROFILING=y diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config index 1210c79a6..16c5cca78 100644 --- a/kernel-ppc64le-debug.config +++ b/kernel-ppc64le-debug.config @@ -4154,7 +4154,7 @@ CONFIG_PROC_EVENTS=y CONFIG_PROC_FS=y CONFIG_PROC_KCORE=y CONFIG_PROC_PID_CPUSET=y -# CONFIG_PROC_VMCORE_DEVICE_DUMP is not set +CONFIG_PROC_VMCORE_DEVICE_DUMP=y CONFIG_PROC_VMCORE=y # CONFIG_PROFILE_ANNOTATED_BRANCHES is not set CONFIG_PROFILING=y diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config index 83724def8..ceab56f00 100644 --- a/kernel-ppc64le.config +++ b/kernel-ppc64le.config @@ -4129,7 +4129,7 @@ CONFIG_PROC_EVENTS=y CONFIG_PROC_FS=y CONFIG_PROC_KCORE=y CONFIG_PROC_PID_CPUSET=y -# CONFIG_PROC_VMCORE_DEVICE_DUMP is not set +CONFIG_PROC_VMCORE_DEVICE_DUMP=y CONFIG_PROC_VMCORE=y # CONFIG_PROFILE_ANNOTATED_BRANCHES is not set CONFIG_PROFILING=y diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config index 6011d649e..00f5de427 100644 --- a/kernel-s390x-debug.config +++ b/kernel-s390x-debug.config @@ -4042,7 +4042,7 @@ CONFIG_PROC_EVENTS=y CONFIG_PROC_FS=y CONFIG_PROC_KCORE=y CONFIG_PROC_PID_CPUSET=y -# CONFIG_PROC_VMCORE_DEVICE_DUMP is not set +CONFIG_PROC_VMCORE_DEVICE_DUMP=y CONFIG_PROC_VMCORE=y # CONFIG_PROFILE_ANNOTATED_BRANCHES is not set CONFIG_PROFILING=y diff --git a/kernel-s390x.config b/kernel-s390x.config index 3d8b7a41b..a2daf6046 100644 --- a/kernel-s390x.config +++ b/kernel-s390x.config @@ -4017,7 +4017,7 @@ CONFIG_PROC_EVENTS=y CONFIG_PROC_FS=y CONFIG_PROC_KCORE=y CONFIG_PROC_PID_CPUSET=y -# CONFIG_PROC_VMCORE_DEVICE_DUMP is not set +CONFIG_PROC_VMCORE_DEVICE_DUMP=y CONFIG_PROC_VMCORE=y # CONFIG_PROFILE_ANNOTATED_BRANCHES is not set CONFIG_PROFILING=y diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config index d1d69f9a4..2f200ea49 100644 --- a/kernel-x86_64-debug.config +++ b/kernel-x86_64-debug.config @@ -4450,7 +4450,7 @@ CONFIG_PROC_EVENTS=y CONFIG_PROC_FS=y CONFIG_PROC_KCORE=y CONFIG_PROC_PID_CPUSET=y -# CONFIG_PROC_VMCORE_DEVICE_DUMP is not set +CONFIG_PROC_VMCORE_DEVICE_DUMP=y CONFIG_PROC_VMCORE=y # CONFIG_PROFILE_ANNOTATED_BRANCHES is not set CONFIG_PROFILING=y diff --git a/kernel-x86_64.config b/kernel-x86_64.config index effde554f..c362c4a4f 100644 --- a/kernel-x86_64.config +++ b/kernel-x86_64.config @@ -4427,7 +4427,7 @@ CONFIG_PROC_EVENTS=y CONFIG_PROC_FS=y CONFIG_PROC_KCORE=y CONFIG_PROC_PID_CPUSET=y -# CONFIG_PROC_VMCORE_DEVICE_DUMP is not set +CONFIG_PROC_VMCORE_DEVICE_DUMP=y CONFIG_PROC_VMCORE=y # CONFIG_PROFILE_ANNOTATED_BRANCHES is not set CONFIG_PROFILING=y diff --git a/kernel.spec b/kernel.spec index 1bac98884..1d1049cd9 100644 --- a/kernel.spec +++ b/kernel.spec @@ -69,7 +69,7 @@ Summary: The Linux kernel # The rc snapshot level %global rcrev 0 # The git snapshot level -%define gitrev 6 +%define gitrev 7 # Set rpm version accordingly %define rpmversion 4.%{upstream_sublevel}.0 %endif @@ -604,6 +604,9 @@ Patch501: Fix-for-module-sig-verification.patch # rhbz 1431375 Patch502: input-rmi4-remove-the-need-for-artifical-IRQ.patch +# Fix build on s390 +Patch503: 0001-s390-mm-Fix-ERROR-__node_distance-undefined.patch + # END OF PATCH DEFINITIONS %endif @@ -1876,6 +1879,9 @@ fi # # %changelog +* Wed Oct 31 2018 Justin M. Forbes - 4.20.0-0.rc0.git7.1 +- Linux v4.19-11807-g310c7585e830 + * Tue Oct 30 2018 Justin M. Forbes - 4.20.0-0.rc0.git6.1 - Linux v4.19-11706-g11743c56785c diff --git a/sources b/sources index b51633461..cdcf1fff7 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (linux-4.19.tar.xz) = ab67cc746b375a8b135e8b23e35e1d6787930d19b3c26b2679787d62951cbdbc3bb66f8ededeb9b890e5008b2459397f9018f1a6772fdef67780b06a4cb9f6f4 -SHA512 (patch-4.19-git6.xz) = 1936630e0205da2c4823be3401e645b743027d2e05ab310c6a89293187b3ad3dfb891ffb2365e594317368844a63b58383d86ddd3ca2bc45a6fc7b06b32091f3 +SHA512 (patch-4.19-git7.xz) = a91de9f05218b9be0049f764d0e135fae3cfa457fee703875a38240836196490684732678cf13303e1ba62fb116d35f61f0ebd8956fd4c492e39accff4b251de