Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-4.18.0-1.vanilla.knurd.1.fc29kernel-4.18.0-1.vanilla.knurd.1.fc28kernel-4.18.0-1.vanilla.knurd.1.fc27

25 files changed, 42 insertions, 34 deletions

diff --git a/configs/fedora/generic/CONFIG_CRYPTO_SPECK b/configs/fedora/generic/CONFIG_CRYPTO_SPECK
index 8c7e39b5a..d7df9f391 100644
--- a/configs/fedora/generic/CONFIG_CRYPTO_SPECK
+++ b/configs/fedora/generic/CONFIG_CRYPTO_SPECK
@@ -1 +1 @@
-CONFIG_CRYPTO_SPECK=m
+# CONFIG_CRYPTO_SPECK is not set
diff --git a/configs/fedora/generic/CONFIG_ZYNQMP_FIRMWARE_DEBUG b/configs/fedora/generic/CONFIG_ZYNQMP_FIRMWARE_DEBUG
new file mode 100644
index 000000000..eb78594e4
--- /dev/null
+++ b/configs/fedora/generic/CONFIG_ZYNQMP_FIRMWARE_DEBUG
@@ -0,0 +1 @@
+# CONFIG_ZYNQMP_FIRMWARE_DEBUG is not set
diff --git a/configs/fedora/generic/arm/CONFIG_CRYPTO_SPECK_NEON b/configs/fedora/generic/arm/CONFIG_CRYPTO_SPECK_NEON
index d6abed0e9..6e3e6dd69 100644
--- a/configs/fedora/generic/arm/CONFIG_CRYPTO_SPECK_NEON
+++ b/configs/fedora/generic/arm/CONFIG_CRYPTO_SPECK_NEON
@@ -1 +1 @@
-CONFIG_CRYPTO_SPECK_NEON=m
+# CONFIG_CRYPTO_SPECK_NEON is not set
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_COMMON_CLK_ZYNQMP b/configs/fedora/generic/arm/aarch64/CONFIG_COMMON_CLK_ZYNQMP
new file mode 100644
index 000000000..1eb94322f
--- /dev/null
+++ b/configs/fedora/generic/arm/aarch64/CONFIG_COMMON_CLK_ZYNQMP
@@ -0,0 +1 @@
+CONFIG_COMMON_CLK_ZYNQMP=y
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_ZYNQMP_FIRMWARE b/configs/fedora/generic/arm/aarch64/CONFIG_ZYNQMP_FIRMWARE
new file mode 100644
index 000000000..01e3607bb
--- /dev/null
+++ b/configs/fedora/generic/arm/aarch64/CONFIG_ZYNQMP_FIRMWARE
@@ -0,0 +1 @@
+CONFIG_ZYNQMP_FIRMWARE=y
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index e95986700..3980e5586 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -1176,8 +1176,8 @@ CONFIG_CRYPTO_SM3_ARM64_CE=m
 CONFIG_CRYPTO_SM3=m
 CONFIG_CRYPTO_SM4_ARM64_CE=m
 CONFIG_CRYPTO_SM4=m
-CONFIG_CRYPTO_SPECK=m
-CONFIG_CRYPTO_SPECK_NEON=m
+# CONFIG_CRYPTO_SPECK is not set
+# CONFIG_CRYPTO_SPECK_NEON is not set
 CONFIG_CRYPTO_TEA=m
 CONFIG_CRYPTO_TEST=m
 CONFIG_CRYPTO_TGR192=m
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index 7d2dc0a51..63be488f8 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -1175,8 +1175,8 @@ CONFIG_CRYPTO_SM3_ARM64_CE=m
 CONFIG_CRYPTO_SM3=m
 CONFIG_CRYPTO_SM4_ARM64_CE=m
 CONFIG_CRYPTO_SM4=m
-CONFIG_CRYPTO_SPECK=m
-CONFIG_CRYPTO_SPECK_NEON=m
+# CONFIG_CRYPTO_SPECK is not set
+# CONFIG_CRYPTO_SPECK_NEON is not set
 CONFIG_CRYPTO_TEA=m
 CONFIG_CRYPTO_TEST=m
 CONFIG_CRYPTO_TGR192=m
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index 4acdb1f13..a5cdbecb5 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -1218,8 +1218,8 @@ CONFIG_CRYPTO_SHA512=m
 CONFIG_CRYPTO_SIMD=y
 CONFIG_CRYPTO_SM3=m
 CONFIG_CRYPTO_SM4=m
-CONFIG_CRYPTO_SPECK=m
-CONFIG_CRYPTO_SPECK_NEON=m
+# CONFIG_CRYPTO_SPECK is not set
+# CONFIG_CRYPTO_SPECK_NEON is not set
 CONFIG_CRYPTO_TEA=m
 CONFIG_CRYPTO_TEST=m
 CONFIG_CRYPTO_TGR192=m
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config
index 3d9711adc..0698736a6 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -1164,8 +1164,8 @@ CONFIG_CRYPTO_SHA512=m
 CONFIG_CRYPTO_SIMD=y
 CONFIG_CRYPTO_SM3=m
 CONFIG_CRYPTO_SM4=m
-CONFIG_CRYPTO_SPECK=m
-CONFIG_CRYPTO_SPECK_NEON=m
+# CONFIG_CRYPTO_SPECK is not set
+# CONFIG_CRYPTO_SPECK_NEON is not set
 CONFIG_CRYPTO_TEA=m
 CONFIG_CRYPTO_TEST=m
 CONFIG_CRYPTO_TGR192=m
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config
index edf99a84b..a300731a7 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -1162,8 +1162,8 @@ CONFIG_CRYPTO_SHA512=m
 CONFIG_CRYPTO_SIMD=y
 CONFIG_CRYPTO_SM3=m
 CONFIG_CRYPTO_SM4=m
-CONFIG_CRYPTO_SPECK=m
-CONFIG_CRYPTO_SPECK_NEON=m
+# CONFIG_CRYPTO_SPECK is not set
+# CONFIG_CRYPTO_SPECK_NEON is not set
 CONFIG_CRYPTO_TEA=m
 CONFIG_CRYPTO_TEST=m
 CONFIG_CRYPTO_TGR192=m
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index b4aa65102..6c5b78bfc 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -1216,8 +1216,8 @@ CONFIG_CRYPTO_SHA512=m
 CONFIG_CRYPTO_SIMD=y
 CONFIG_CRYPTO_SM3=m
 CONFIG_CRYPTO_SM4=m
-CONFIG_CRYPTO_SPECK=m
-CONFIG_CRYPTO_SPECK_NEON=m
+# CONFIG_CRYPTO_SPECK is not set
+# CONFIG_CRYPTO_SPECK_NEON is not set
 CONFIG_CRYPTO_TEA=m
 CONFIG_CRYPTO_TEST=m
 CONFIG_CRYPTO_TGR192=m
diff --git a/kernel-i686-PAE.config b/kernel-i686-PAE.config
index 0834591e7..21da47b4a 100644
--- a/kernel-i686-PAE.config
+++ b/kernel-i686-PAE.config
@@ -997,7 +997,7 @@ CONFIG_CRYPTO_SHA512=m
 CONFIG_CRYPTO_SIMD=y
 CONFIG_CRYPTO_SM3=m
 CONFIG_CRYPTO_SM4=m
-CONFIG_CRYPTO_SPECK=m
+# CONFIG_CRYPTO_SPECK is not set
 CONFIG_CRYPTO_TEA=m
 CONFIG_CRYPTO_TEST=m
 CONFIG_CRYPTO_TGR192=m
diff --git a/kernel-i686-PAEdebug.config b/kernel-i686-PAEdebug.config
index fab02ee69..5edc9265c 100644
--- a/kernel-i686-PAEdebug.config
+++ b/kernel-i686-PAEdebug.config
@@ -1001,7 +1001,7 @@ CONFIG_CRYPTO_SHA512=m
 CONFIG_CRYPTO_SIMD=y
 CONFIG_CRYPTO_SM3=m
 CONFIG_CRYPTO_SM4=m
-CONFIG_CRYPTO_SPECK=m
+# CONFIG_CRYPTO_SPECK is not set
 CONFIG_CRYPTO_TEA=m
 CONFIG_CRYPTO_TEST=m
 CONFIG_CRYPTO_TGR192=m
diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config
index 8ee08e686..664841322 100644
--- a/kernel-i686-debug.config
+++ b/kernel-i686-debug.config
@@ -1001,7 +1001,7 @@ CONFIG_CRYPTO_SHA512=m
 CONFIG_CRYPTO_SIMD=y
 CONFIG_CRYPTO_SM3=m
 CONFIG_CRYPTO_SM4=m
-CONFIG_CRYPTO_SPECK=m
+# CONFIG_CRYPTO_SPECK is not set
 CONFIG_CRYPTO_TEA=m
 CONFIG_CRYPTO_TEST=m
 CONFIG_CRYPTO_TGR192=m
diff --git a/kernel-i686.config b/kernel-i686.config
index 8f387bbb1..b690f1e1c 100644
--- a/kernel-i686.config
+++ b/kernel-i686.config
@@ -997,7 +997,7 @@ CONFIG_CRYPTO_SHA512=m
 CONFIG_CRYPTO_SIMD=y
 CONFIG_CRYPTO_SM3=m
 CONFIG_CRYPTO_SM4=m
-CONFIG_CRYPTO_SPECK=m
+# CONFIG_CRYPTO_SPECK is not set
 CONFIG_CRYPTO_TEA=m
 CONFIG_CRYPTO_TEST=m
 CONFIG_CRYPTO_TGR192=m
diff --git a/kernel-ppc64-debug.config b/kernel-ppc64-debug.config
index 32835ba70..138e142df 100644
--- a/kernel-ppc64-debug.config
+++ b/kernel-ppc64-debug.config
@@ -983,7 +983,7 @@ CONFIG_CRYPTO_SHA512=m
 CONFIG_CRYPTO_SIMD=y
 CONFIG_CRYPTO_SM3=m
 CONFIG_CRYPTO_SM4=m
-CONFIG_CRYPTO_SPECK=m
+# CONFIG_CRYPTO_SPECK is not set
 CONFIG_CRYPTO_TEA=m
 CONFIG_CRYPTO_TEST=m
 CONFIG_CRYPTO_TGR192=m
diff --git a/kernel-ppc64.config b/kernel-ppc64.config
index f162ac6df..45322c8c9 100644
--- a/kernel-ppc64.config
+++ b/kernel-ppc64.config
@@ -979,7 +979,7 @@ CONFIG_CRYPTO_SHA512=m
 CONFIG_CRYPTO_SIMD=y
 CONFIG_CRYPTO_SM3=m
 CONFIG_CRYPTO_SM4=m
-CONFIG_CRYPTO_SPECK=m
+# CONFIG_CRYPTO_SPECK is not set
 CONFIG_CRYPTO_TEA=m
 CONFIG_CRYPTO_TEST=m
 CONFIG_CRYPTO_TGR192=m
diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config
index 8d5a8d6db..20354a942 100644
--- a/kernel-ppc64le-debug.config
+++ b/kernel-ppc64le-debug.config
@@ -937,7 +937,7 @@ CONFIG_CRYPTO_SHA512=m
 CONFIG_CRYPTO_SIMD=y
 CONFIG_CRYPTO_SM3=m
 CONFIG_CRYPTO_SM4=m
-CONFIG_CRYPTO_SPECK=m
+# CONFIG_CRYPTO_SPECK is not set
 CONFIG_CRYPTO_TEA=m
 CONFIG_CRYPTO_TEST=m
 CONFIG_CRYPTO_TGR192=m
diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config
index 5b281a436..1ab561ec0 100644
--- a/kernel-ppc64le.config
+++ b/kernel-ppc64le.config
@@ -933,7 +933,7 @@ CONFIG_CRYPTO_SHA512=m
 CONFIG_CRYPTO_SIMD=y
 CONFIG_CRYPTO_SM3=m
 CONFIG_CRYPTO_SM4=m
-CONFIG_CRYPTO_SPECK=m
+# CONFIG_CRYPTO_SPECK is not set
 CONFIG_CRYPTO_TEA=m
 CONFIG_CRYPTO_TEST=m
 CONFIG_CRYPTO_TGR192=m
diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config
index 4f8f333e2..8d7aea7fd 100644
--- a/kernel-s390x-debug.config
+++ b/kernel-s390x-debug.config
@@ -935,7 +935,7 @@ CONFIG_CRYPTO_SHA512_S390=m
 CONFIG_CRYPTO_SIMD=y
 CONFIG_CRYPTO_SM3=m
 CONFIG_CRYPTO_SM4=m
-CONFIG_CRYPTO_SPECK=m
+# CONFIG_CRYPTO_SPECK is not set
 CONFIG_CRYPTO_TEA=m
 CONFIG_CRYPTO_TEST=m
 CONFIG_CRYPTO_TGR192=m
diff --git a/kernel-s390x.config b/kernel-s390x.config
index e68f395e5..c790a012f 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -931,7 +931,7 @@ CONFIG_CRYPTO_SHA512_S390=m
 CONFIG_CRYPTO_SIMD=y
 CONFIG_CRYPTO_SM3=m
 CONFIG_CRYPTO_SM4=m
-CONFIG_CRYPTO_SPECK=m
+# CONFIG_CRYPTO_SPECK is not set
 CONFIG_CRYPTO_TEA=m
 CONFIG_CRYPTO_TEST=m
 CONFIG_CRYPTO_TGR192=m
diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config
index b8298162a..e3fc59be4 100644
--- a/kernel-x86_64-debug.config
+++ b/kernel-x86_64-debug.config
@@ -1042,7 +1042,7 @@ CONFIG_CRYPTO_SIMD=y
 # CONFIG_CRYPTO_SKEIN is not set
 CONFIG_CRYPTO_SM3=m
 CONFIG_CRYPTO_SM4=m
-CONFIG_CRYPTO_SPECK=m
+# CONFIG_CRYPTO_SPECK is not set
 CONFIG_CRYPTO_TEA=m
 CONFIG_CRYPTO_TEST=m
 CONFIG_CRYPTO_TGR192=m
diff --git a/kernel-x86_64.config b/kernel-x86_64.config
index cf9c26888..1c7b0a091 100644
--- a/kernel-x86_64.config
+++ b/kernel-x86_64.config
@@ -1038,7 +1038,7 @@ CONFIG_CRYPTO_SIMD=y
 # CONFIG_CRYPTO_SKEIN is not set
 CONFIG_CRYPTO_SM3=m
 CONFIG_CRYPTO_SM4=m
-CONFIG_CRYPTO_SPECK=m
+# CONFIG_CRYPTO_SPECK is not set
 CONFIG_CRYPTO_TEA=m
 CONFIG_CRYPTO_TEST=m
 CONFIG_CRYPTO_TGR192=m
diff --git a/kernel.spec b/kernel.spec
index dcd7d70b2..541b6b7da 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -6,7 +6,7 @@ Summary: The Linux kernel
 # For a stable, released kernel, released_kernel should be 1. For rawhide
 # and/or a kernel built from an rc or git snapshot, released_kernel should
 # be 0.
-%global released_kernel 0
+%global released_kernel 1
 
 # Sign modules on x86.  Make sure the config files match this setting if more
 # architectures are added.
@@ -50,7 +50,7 @@ Summary: The Linux kernel
 # base_sublevel is the kernel version we're starting with and patching
 # on top of -- for example, 3.1-rc7-git1 starts with a 3.0 base,
 # which yields a base_sublevel of 0.
-%define base_sublevel 17
+%define base_sublevel 18
 
 ## If this is a released kernel ##
 %if 0%{?released_kernel}
@@ -75,9 +75,9 @@ Summary: The Linux kernel
 # The next upstream release sublevel (base_sublevel+1)
 %define upstream_sublevel %(echo $((%{base_sublevel} + 1)))
 # The rc snapshot level
-%global rcrev 8
+%global rcrev 0
 # The git snapshot level
-%define gitrev 2
+%define gitrev 0
 # Set rpm version accordingly
 %define rpmversion 4.%{upstream_sublevel}.0
 %endif
@@ -130,7 +130,7 @@ Summary: The Linux kernel
 # Set debugbuildsenabled to 1 for production (build separate debug kernels)
 #  and 0 for rawhide (all kernels are debug kernels).
 # See also 'make debug' and 'make release'.
-%define debugbuildsenabled 0
+%define debugbuildsenabled 1
 
 # Kernel headers are being split out into a separate package
 %define with_headers 0
@@ -1930,6 +1930,13 @@ fi
 #
 #
 %changelog
+* Mon Aug 13 2018 Laura Abbott <labbott@redhat.com> - 4.18.0-1
+- Linux v4.18
+- Disable debugging options.
+
+* Mon Aug 13 2018 Peter Robinson <pbrobinson@fedoraproject.org>
+- Disable speck crypto cipher
+
 * Sat Aug 11 2018 Peter Robinson <pbrobinson@fedoraproject.org>
 - Add ZYNQMP clock and firmware driver
 
diff --git a/sources b/sources
index 3defd5730..5e47cc9df 100644
--- a/sources
+++ b/sources
@@ -1,3 +1 @@
-SHA512 (linux-4.17.tar.xz) = 4d9de340a26155a89ea8773131c76220cc2057f2b5d031b467b60e8b14c1842518e2d60a863d8c695f0f7640f3f18d43826201984a238dade857b6cef79837db
-SHA512 (patch-4.18-rc8.xz) = 59a5ae81037f60372dcbdb64e47750cae0a19d8d5e99aeba01d7ebc7121715890ed9c2ef90a264356ed06eac4a15067e89add148a3c667713a17b105bd51e40b
-SHA512 (patch-4.18-rc8-git2.xz) = 80b2034875e9acaeb7ddcc09bea7fd5079096c28538885002aedbbba8224755d53a645fb0a2b765ae2e2f7b24e1269c6f357b64fc76f0cef64db969fc77b2c21
+SHA512 (linux-4.18.tar.xz) = 950eb85ac743b291afe9f21cd174d823e25f11883ee62cecfbfff8fe8c5672aae707654b1b8f29a133b1f2e3529e63b9f7fba4c45d6dacccc8000b3a9a9ae038