summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2018-10-31 19:56:12 +0100
committerThorsten Leemhuis <fedora@leemhuis.info>2018-10-31 19:56:12 +0100
commita59d2a403d404c335e5eae4cadcb7f35bdedf492 (patch)
tree5275caaf98ca42a1711cb806c62d14d3464afe17
parent7158faaa9bb114d4c7573eb3e529da4f0156a5f1 (diff)
parentbf0b23e3a4943c10e28b2f40cbfef0a1c278d0f6 (diff)
downloadkernel-4.20.0-0.rc0.git7.1.vanilla.knurd.1.fc28.tar.gz
kernel-4.20.0-0.rc0.git7.1.vanilla.knurd.1.fc28.tar.xz
kernel-4.20.0-0.rc0.git7.1.vanilla.knurd.1.fc28.zip
-rw-r--r--0001-s390-mm-Fix-ERROR-__node_distance-undefined.patch32
-rw-r--r--configs/fedora/generic/CONFIG_BLK_DEV_DAC9601
-rw-r--r--configs/fedora/generic/CONFIG_CRYPTO_SPECK1
-rw-r--r--configs/fedora/generic/CONFIG_PROC_VMCORE_DEVICE_DUMP2
-rw-r--r--configs/fedora/generic/arm/CONFIG_BLK_DEV_DAC9601
-rw-r--r--configs/fedora/generic/arm/CONFIG_CRYPTO_SPECK_NEON1
-rw-r--r--configs/fedora/generic/s390x/CONFIG_BLK_DEV_DAC9601
-rw-r--r--gitrev2
-rw-r--r--kernel-aarch64-debug.config5
-rw-r--r--kernel-aarch64.config5
-rw-r--r--kernel-armv7hl-debug.config5
-rw-r--r--kernel-armv7hl-lpae-debug.config5
-rw-r--r--kernel-armv7hl-lpae.config5
-rw-r--r--kernel-armv7hl.config5
-rw-r--r--kernel-i686-debug.config4
-rw-r--r--kernel-i686.config4
-rw-r--r--kernel-ppc64le-debug.config4
-rw-r--r--kernel-ppc64le.config4
-rw-r--r--kernel-s390x-debug.config4
-rw-r--r--kernel-s390x.config4
-rw-r--r--kernel-x86_64-debug.config4
-rw-r--r--kernel-x86_64.config4
-rw-r--r--kernel.spec8
-rw-r--r--sources2
24 files changed, 56 insertions, 57 deletions
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" <jforbes@fedoraproject.org>
+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 <jforbes@fedoraproject.org>
+---
+ 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_BLK_DEV_DAC960 b/configs/fedora/generic/CONFIG_BLK_DEV_DAC960
deleted file mode 100644
index c6817f9bc..000000000
--- a/configs/fedora/generic/CONFIG_BLK_DEV_DAC960
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_BLK_DEV_DAC960=m
diff --git a/configs/fedora/generic/CONFIG_CRYPTO_SPECK b/configs/fedora/generic/CONFIG_CRYPTO_SPECK
deleted file mode 100644
index d7df9f391..000000000
--- a/configs/fedora/generic/CONFIG_CRYPTO_SPECK
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_CRYPTO_SPECK is not set
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/configs/fedora/generic/arm/CONFIG_BLK_DEV_DAC960 b/configs/fedora/generic/arm/CONFIG_BLK_DEV_DAC960
deleted file mode 100644
index 4cc1142cb..000000000
--- a/configs/fedora/generic/arm/CONFIG_BLK_DEV_DAC960
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_BLK_DEV_DAC960 is not set
diff --git a/configs/fedora/generic/arm/CONFIG_CRYPTO_SPECK_NEON b/configs/fedora/generic/arm/CONFIG_CRYPTO_SPECK_NEON
deleted file mode 100644
index 6e3e6dd69..000000000
--- a/configs/fedora/generic/arm/CONFIG_CRYPTO_SPECK_NEON
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_CRYPTO_SPECK_NEON is not set
diff --git a/configs/fedora/generic/s390x/CONFIG_BLK_DEV_DAC960 b/configs/fedora/generic/s390x/CONFIG_BLK_DEV_DAC960
deleted file mode 100644
index 4cc1142cb..000000000
--- a/configs/fedora/generic/s390x/CONFIG_BLK_DEV_DAC960
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_BLK_DEV_DAC960 is not set
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 a11057863..f6c0eca85 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -603,7 +603,6 @@ CONFIG_BLK_DEBUG_FS=y
CONFIG_BLK_DEV_BSGLIB=y
CONFIG_BLK_DEV_BSG=y
# CONFIG_BLK_DEV_CRYPTOLOOP is not set
-# CONFIG_BLK_DEV_DAC960 is not set
CONFIG_BLK_DEV_DM=y
CONFIG_BLK_DEV_DRBD=m
CONFIG_BLK_DEV_FD=m
@@ -1212,8 +1211,6 @@ CONFIG_CRYPTO_SM3_ARM64_CE=m
CONFIG_CRYPTO_SM3=m
CONFIG_CRYPTO_SM4_ARM64_CE=m
CONFIG_CRYPTO_SM4=m
-# CONFIG_CRYPTO_SPECK is not set
-# CONFIG_CRYPTO_SPECK_NEON is not set
CONFIG_CRYPTO_STATS=y
CONFIG_CRYPTO_TEA=m
CONFIG_CRYPTO_TEST=m
@@ -4624,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 019e4ca01..7a868294b 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -603,7 +603,6 @@ CONFIG_BLK_DEBUG_FS=y
CONFIG_BLK_DEV_BSGLIB=y
CONFIG_BLK_DEV_BSG=y
# CONFIG_BLK_DEV_CRYPTOLOOP is not set
-# CONFIG_BLK_DEV_DAC960 is not set
CONFIG_BLK_DEV_DM=y
CONFIG_BLK_DEV_DRBD=m
CONFIG_BLK_DEV_FD=m
@@ -1211,8 +1210,6 @@ CONFIG_CRYPTO_SM3_ARM64_CE=m
CONFIG_CRYPTO_SM3=m
CONFIG_CRYPTO_SM4_ARM64_CE=m
CONFIG_CRYPTO_SM4=m
-# CONFIG_CRYPTO_SPECK is not set
-# CONFIG_CRYPTO_SPECK_NEON is not set
CONFIG_CRYPTO_STATS=y
CONFIG_CRYPTO_TEA=m
CONFIG_CRYPTO_TEST=m
@@ -4602,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 bad80c197..84b507183 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -633,7 +633,6 @@ CONFIG_BLK_DEBUG_FS=y
CONFIG_BLK_DEV_BSGLIB=y
CONFIG_BLK_DEV_BSG=y
# CONFIG_BLK_DEV_CRYPTOLOOP is not set
-# CONFIG_BLK_DEV_DAC960 is not set
CONFIG_BLK_DEV_DM=y
CONFIG_BLK_DEV_DRBD=m
CONFIG_BLK_DEV_FD=m
@@ -1248,8 +1247,6 @@ CONFIG_CRYPTO_SHA512=m
CONFIG_CRYPTO_SIMD=y
CONFIG_CRYPTO_SM3=m
CONFIG_CRYPTO_SM4=m
-# CONFIG_CRYPTO_SPECK is not set
-# CONFIG_CRYPTO_SPECK_NEON is not set
CONFIG_CRYPTO_STATS=y
CONFIG_CRYPTO_TEA=m
CONFIG_CRYPTO_TEST=m
@@ -4888,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 1e3b884df..d7364e212 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -608,7 +608,6 @@ CONFIG_BLK_DEBUG_FS=y
CONFIG_BLK_DEV_BSGLIB=y
CONFIG_BLK_DEV_BSG=y
# CONFIG_BLK_DEV_CRYPTOLOOP is not set
-# CONFIG_BLK_DEV_DAC960 is not set
CONFIG_BLK_DEV_DM=y
CONFIG_BLK_DEV_DRBD=m
CONFIG_BLK_DEV_FD=m
@@ -1194,8 +1193,6 @@ CONFIG_CRYPTO_SHA512=m
CONFIG_CRYPTO_SIMD=y
CONFIG_CRYPTO_SM3=m
CONFIG_CRYPTO_SM4=m
-# CONFIG_CRYPTO_SPECK is not set
-# CONFIG_CRYPTO_SPECK_NEON is not set
CONFIG_CRYPTO_STATS=y
CONFIG_CRYPTO_TEA=m
CONFIG_CRYPTO_TEST=m
@@ -4645,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 4633f7595..c55e49caf 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -607,7 +607,6 @@ CONFIG_BLK_DEBUG_FS=y
CONFIG_BLK_DEV_BSGLIB=y
CONFIG_BLK_DEV_BSG=y
# CONFIG_BLK_DEV_CRYPTOLOOP is not set
-# CONFIG_BLK_DEV_DAC960 is not set
CONFIG_BLK_DEV_DM=y
CONFIG_BLK_DEV_DRBD=m
CONFIG_BLK_DEV_FD=m
@@ -1192,8 +1191,6 @@ CONFIG_CRYPTO_SHA512=m
CONFIG_CRYPTO_SIMD=y
CONFIG_CRYPTO_SM3=m
CONFIG_CRYPTO_SM4=m
-# CONFIG_CRYPTO_SPECK is not set
-# CONFIG_CRYPTO_SPECK_NEON is not set
CONFIG_CRYPTO_STATS=y
CONFIG_CRYPTO_TEA=m
CONFIG_CRYPTO_TEST=m
@@ -4623,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 0ccd1991f..50e558ab5 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -632,7 +632,6 @@ CONFIG_BLK_DEBUG_FS=y
CONFIG_BLK_DEV_BSGLIB=y
CONFIG_BLK_DEV_BSG=y
# CONFIG_BLK_DEV_CRYPTOLOOP is not set
-# CONFIG_BLK_DEV_DAC960 is not set
CONFIG_BLK_DEV_DM=y
CONFIG_BLK_DEV_DRBD=m
CONFIG_BLK_DEV_FD=m
@@ -1246,8 +1245,6 @@ CONFIG_CRYPTO_SHA512=m
CONFIG_CRYPTO_SIMD=y
CONFIG_CRYPTO_SM3=m
CONFIG_CRYPTO_SM4=m
-# CONFIG_CRYPTO_SPECK is not set
-# CONFIG_CRYPTO_SPECK_NEON is not set
CONFIG_CRYPTO_STATS=y
CONFIG_CRYPTO_TEA=m
CONFIG_CRYPTO_TEST=m
@@ -4866,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 4dc4cd571..6ba8c68bb 100644
--- a/kernel-i686-debug.config
+++ b/kernel-i686-debug.config
@@ -491,7 +491,6 @@ CONFIG_BLK_DEV_AMD74XX=y
CONFIG_BLK_DEV_BSGLIB=y
CONFIG_BLK_DEV_BSG=y
# CONFIG_BLK_DEV_CRYPTOLOOP is not set
-CONFIG_BLK_DEV_DAC960=m
CONFIG_BLK_DEV_DM=y
CONFIG_BLK_DEV_DRBD=m
CONFIG_BLK_DEV_FD=m
@@ -1035,7 +1034,6 @@ CONFIG_CRYPTO_SHA512=m
CONFIG_CRYPTO_SIMD=y
CONFIG_CRYPTO_SM3=m
CONFIG_CRYPTO_SM4=m
-# CONFIG_CRYPTO_SPECK is not set
CONFIG_CRYPTO_STATS=y
CONFIG_CRYPTO_TEA=m
CONFIG_CRYPTO_TEST=m
@@ -4412,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 dc248cebc..31f833ef9 100644
--- a/kernel-i686.config
+++ b/kernel-i686.config
@@ -488,7 +488,6 @@ CONFIG_BLK_DEV_AMD74XX=y
CONFIG_BLK_DEV_BSGLIB=y
CONFIG_BLK_DEV_BSG=y
# CONFIG_BLK_DEV_CRYPTOLOOP is not set
-CONFIG_BLK_DEV_DAC960=m
CONFIG_BLK_DEV_DM=y
CONFIG_BLK_DEV_DRBD=m
CONFIG_BLK_DEV_FD=m
@@ -1031,7 +1030,6 @@ CONFIG_CRYPTO_SHA512=m
CONFIG_CRYPTO_SIMD=y
CONFIG_CRYPTO_SM3=m
CONFIG_CRYPTO_SM4=m
-# CONFIG_CRYPTO_SPECK is not set
CONFIG_CRYPTO_STATS=y
CONFIG_CRYPTO_TEA=m
CONFIG_CRYPTO_TEST=m
@@ -4389,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 a28cdbf49..16c5cca78 100644
--- a/kernel-ppc64le-debug.config
+++ b/kernel-ppc64le-debug.config
@@ -428,7 +428,6 @@ CONFIG_BLK_DEV_3W_XXXX_RAID=m
CONFIG_BLK_DEV_BSGLIB=y
CONFIG_BLK_DEV_BSG=y
# CONFIG_BLK_DEV_CRYPTOLOOP is not set
-CONFIG_BLK_DEV_DAC960=m
CONFIG_BLK_DEV_DM=y
CONFIG_BLK_DEV_DRBD=m
CONFIG_BLK_DEV_FD=m
@@ -967,7 +966,6 @@ CONFIG_CRYPTO_SHA512=m
CONFIG_CRYPTO_SIMD=y
CONFIG_CRYPTO_SM3=m
CONFIG_CRYPTO_SM4=m
-# CONFIG_CRYPTO_SPECK is not set
CONFIG_CRYPTO_STATS=y
CONFIG_CRYPTO_TEA=m
CONFIG_CRYPTO_TEST=m
@@ -4156,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 3a1eaf9d6..ceab56f00 100644
--- a/kernel-ppc64le.config
+++ b/kernel-ppc64le.config
@@ -425,7 +425,6 @@ CONFIG_BLK_DEV_3W_XXXX_RAID=m
CONFIG_BLK_DEV_BSGLIB=y
CONFIG_BLK_DEV_BSG=y
# CONFIG_BLK_DEV_CRYPTOLOOP is not set
-CONFIG_BLK_DEV_DAC960=m
CONFIG_BLK_DEV_DM=y
CONFIG_BLK_DEV_DRBD=m
CONFIG_BLK_DEV_FD=m
@@ -963,7 +962,6 @@ CONFIG_CRYPTO_SHA512=m
CONFIG_CRYPTO_SIMD=y
CONFIG_CRYPTO_SM3=m
CONFIG_CRYPTO_SM4=m
-# CONFIG_CRYPTO_SPECK is not set
CONFIG_CRYPTO_STATS=y
CONFIG_CRYPTO_TEA=m
CONFIG_CRYPTO_TEST=m
@@ -4131,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 f91cb208f..00f5de427 100644
--- a/kernel-s390x-debug.config
+++ b/kernel-s390x-debug.config
@@ -431,7 +431,6 @@ CONFIG_BLK_DEBUG_FS=y
CONFIG_BLK_DEV_BSGLIB=y
CONFIG_BLK_DEV_BSG=y
# CONFIG_BLK_DEV_CRYPTOLOOP is not set
-# CONFIG_BLK_DEV_DAC960 is not set
CONFIG_BLK_DEV_DM=y
CONFIG_BLK_DEV_DRBD=m
CONFIG_BLK_DEV_FD=m
@@ -965,7 +964,6 @@ CONFIG_CRYPTO_SHA512_S390=m
CONFIG_CRYPTO_SIMD=y
CONFIG_CRYPTO_SM3=m
CONFIG_CRYPTO_SM4=m
-# CONFIG_CRYPTO_SPECK is not set
CONFIG_CRYPTO_STATS=y
CONFIG_CRYPTO_TEA=m
CONFIG_CRYPTO_TEST=m
@@ -4044,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 f57738cd7..a2daf6046 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -428,7 +428,6 @@ CONFIG_BLK_DEBUG_FS=y
CONFIG_BLK_DEV_BSGLIB=y
CONFIG_BLK_DEV_BSG=y
# CONFIG_BLK_DEV_CRYPTOLOOP is not set
-# CONFIG_BLK_DEV_DAC960 is not set
CONFIG_BLK_DEV_DM=y
CONFIG_BLK_DEV_DRBD=m
CONFIG_BLK_DEV_FD=m
@@ -961,7 +960,6 @@ CONFIG_CRYPTO_SHA512_S390=m
CONFIG_CRYPTO_SIMD=y
CONFIG_CRYPTO_SM3=m
CONFIG_CRYPTO_SM4=m
-# CONFIG_CRYPTO_SPECK is not set
CONFIG_CRYPTO_STATS=y
CONFIG_CRYPTO_TEA=m
CONFIG_CRYPTO_TEST=m
@@ -4019,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 8045ff5cb..2f200ea49 100644
--- a/kernel-x86_64-debug.config
+++ b/kernel-x86_64-debug.config
@@ -501,7 +501,6 @@ CONFIG_BLK_DEV_BSG=y
# CONFIG_BLK_DEV_CS5520 is not set
# CONFIG_BLK_DEV_CS5530 is not set
# CONFIG_BLK_DEV_CS5535 is not set
-CONFIG_BLK_DEV_DAC960=m
CONFIG_BLK_DEV_DM=y
CONFIG_BLK_DEV_DRBD=m
CONFIG_BLK_DEV_FD=m
@@ -1075,7 +1074,6 @@ CONFIG_CRYPTO_SIMD=y
# CONFIG_CRYPTO_SKEIN is not set
CONFIG_CRYPTO_SM3=m
CONFIG_CRYPTO_SM4=m
-# CONFIG_CRYPTO_SPECK is not set
CONFIG_CRYPTO_STATS=y
CONFIG_CRYPTO_TEA=m
CONFIG_CRYPTO_TEST=m
@@ -4452,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 9197d6005..c362c4a4f 100644
--- a/kernel-x86_64.config
+++ b/kernel-x86_64.config
@@ -498,7 +498,6 @@ CONFIG_BLK_DEV_BSG=y
# CONFIG_BLK_DEV_CS5520 is not set
# CONFIG_BLK_DEV_CS5530 is not set
# CONFIG_BLK_DEV_CS5535 is not set
-CONFIG_BLK_DEV_DAC960=m
CONFIG_BLK_DEV_DM=y
CONFIG_BLK_DEV_DRBD=m
CONFIG_BLK_DEV_FD=m
@@ -1071,7 +1070,6 @@ CONFIG_CRYPTO_SIMD=y
# CONFIG_CRYPTO_SKEIN is not set
CONFIG_CRYPTO_SM3=m
CONFIG_CRYPTO_SM4=m
-# CONFIG_CRYPTO_SPECK is not set
CONFIG_CRYPTO_STATS=y
CONFIG_CRYPTO_TEA=m
CONFIG_CRYPTO_TEST=m
@@ -4429,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 25e65630a..e4142b483 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -77,7 +77,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
@@ -621,6 +621,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
@@ -1896,6 +1899,9 @@ fi
#
#
%changelog
+* Wed Oct 31 2018 Justin M. Forbes <jforbes@fedoraproject.org> - 4.20.0-0.rc0.git7.1
+- Linux v4.19-11807-g310c7585e830
+
* Tue Oct 30 2018 Justin M. Forbes <jforbes@fedoraproject.org> - 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