Merge remote-tracking branch 'origin/master'kernel-4.12.0-0.rc5.git0.1.vanilla.knurd.1.fc27kernel-4.12.0-0.rc5.git0.1.vanilla.knurd.1.fc26kernel-4.12.0-0.rc5.git0.1.vanilla.knurd.1.fc25kernel-4.12.0-0.rc5.git0.1.vanilla.knurd.1.fc24

24 files changed, 30 insertions, 27 deletions

diff --git a/baseconfig/CONFIG_CRYPTO_DH b/baseconfig/CONFIG_CRYPTO_DH
index ea06ab3c2..c92378433 100644
--- a/baseconfig/CONFIG_CRYPTO_DH
+++ b/baseconfig/CONFIG_CRYPTO_DH
@@ -1 +1 @@
-CONFIG_CRYPTO_DH=m
+CONFIG_CRYPTO_DH=y
diff --git a/gitrev b/gitrev
index 372b89c31..37d3ed9b0 100644
--- a/gitrev
+++ b/gitrev
@@ -1 +1 @@
-eb4125dfdb1f64a5e41da8315bff48f67e5d1712
+32c1431eea4881a6b17bd7c639315010aeefa452
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index c28ec4aeb..c9c64e570 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -989,7 +989,7 @@ CONFIG_CRYPTO_DEV_QCE=m
 CONFIG_CRYPTO_DEV_ROCKCHIP=m
 CONFIG_CRYPTO_DEV_SAFEXCEL=m
 CONFIG_CRYPTO_DEV_VIRTIO=m
-CONFIG_CRYPTO_DH=m
+CONFIG_CRYPTO_DH=y
 CONFIG_CRYPTO_DRBG_CTR=y
 CONFIG_CRYPTO_DRBG_HASH=y
 CONFIG_CRYPTO_DRBG_MENU=y
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index 9ed873353..6b0226998 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -988,7 +988,7 @@ CONFIG_CRYPTO_DEV_QCE=m
 CONFIG_CRYPTO_DEV_ROCKCHIP=m
 CONFIG_CRYPTO_DEV_SAFEXCEL=m
 CONFIG_CRYPTO_DEV_VIRTIO=m
-CONFIG_CRYPTO_DH=m
+CONFIG_CRYPTO_DH=y
 CONFIG_CRYPTO_DRBG_CTR=y
 CONFIG_CRYPTO_DRBG_HASH=y
 CONFIG_CRYPTO_DRBG_MENU=y
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index edfd318bd..bb7488db0 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -1047,7 +1047,7 @@ CONFIG_CRYPTO_DEV_S5P=m
 CONFIG_CRYPTO_DEV_SAHARA=m
 CONFIG_CRYPTO_DEV_SUN4I_SS=m
 CONFIG_CRYPTO_DEV_VIRTIO=m
-CONFIG_CRYPTO_DH=m
+CONFIG_CRYPTO_DH=y
 CONFIG_CRYPTO_DRBG_CTR=y
 CONFIG_CRYPTO_DRBG_HASH=y
 CONFIG_CRYPTO_DRBG_MENU=y
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config
index 564bb8fa4..1e803f5d0 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -999,7 +999,7 @@ CONFIG_CRYPTO_DEV_ROCKCHIP=m
 CONFIG_CRYPTO_DEV_S5P=m
 CONFIG_CRYPTO_DEV_SUN4I_SS=m
 CONFIG_CRYPTO_DEV_VIRTIO=m
-CONFIG_CRYPTO_DH=m
+CONFIG_CRYPTO_DH=y
 CONFIG_CRYPTO_DRBG_CTR=y
 CONFIG_CRYPTO_DRBG_HASH=y
 CONFIG_CRYPTO_DRBG_MENU=y
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config
index 408e69f2f..1cfebf063 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -997,7 +997,7 @@ CONFIG_CRYPTO_DEV_ROCKCHIP=m
 CONFIG_CRYPTO_DEV_S5P=m
 CONFIG_CRYPTO_DEV_SUN4I_SS=m
 CONFIG_CRYPTO_DEV_VIRTIO=m
-CONFIG_CRYPTO_DH=m
+CONFIG_CRYPTO_DH=y
 CONFIG_CRYPTO_DRBG_CTR=y
 CONFIG_CRYPTO_DRBG_HASH=y
 CONFIG_CRYPTO_DRBG_MENU=y
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index 07070ee8f..4dfe85f38 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -1045,7 +1045,7 @@ CONFIG_CRYPTO_DEV_S5P=m
 CONFIG_CRYPTO_DEV_SAHARA=m
 CONFIG_CRYPTO_DEV_SUN4I_SS=m
 CONFIG_CRYPTO_DEV_VIRTIO=m
-CONFIG_CRYPTO_DH=m
+CONFIG_CRYPTO_DH=y
 CONFIG_CRYPTO_DRBG_CTR=y
 CONFIG_CRYPTO_DRBG_HASH=y
 CONFIG_CRYPTO_DRBG_MENU=y
diff --git a/kernel-i686-PAE.config b/kernel-i686-PAE.config
index 3e4a60eea..1fee46272 100644
--- a/kernel-i686-PAE.config
+++ b/kernel-i686-PAE.config
@@ -857,7 +857,7 @@ CONFIG_CRYPTO_DEV_QAT_C62XVF=m
 CONFIG_CRYPTO_DEV_QAT_DH895xCC=m
 CONFIG_CRYPTO_DEV_QAT_DH895xCCVF=m
 CONFIG_CRYPTO_DEV_VIRTIO=m
-CONFIG_CRYPTO_DH=m
+CONFIG_CRYPTO_DH=y
 CONFIG_CRYPTO_DRBG_CTR=y
 CONFIG_CRYPTO_DRBG_HASH=y
 CONFIG_CRYPTO_DRBG_MENU=y
diff --git a/kernel-i686-PAEdebug.config b/kernel-i686-PAEdebug.config
index 606452c2e..1776039a0 100644
--- a/kernel-i686-PAEdebug.config
+++ b/kernel-i686-PAEdebug.config
@@ -859,7 +859,7 @@ CONFIG_CRYPTO_DEV_QAT_C62XVF=m
 CONFIG_CRYPTO_DEV_QAT_DH895xCC=m
 CONFIG_CRYPTO_DEV_QAT_DH895xCCVF=m
 CONFIG_CRYPTO_DEV_VIRTIO=m
-CONFIG_CRYPTO_DH=m
+CONFIG_CRYPTO_DH=y
 CONFIG_CRYPTO_DRBG_CTR=y
 CONFIG_CRYPTO_DRBG_HASH=y
 CONFIG_CRYPTO_DRBG_MENU=y
diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config
index ec40fc8c2..92b5f6002 100644
--- a/kernel-i686-debug.config
+++ b/kernel-i686-debug.config
@@ -859,7 +859,7 @@ CONFIG_CRYPTO_DEV_QAT_C62XVF=m
 CONFIG_CRYPTO_DEV_QAT_DH895xCC=m
 CONFIG_CRYPTO_DEV_QAT_DH895xCCVF=m
 CONFIG_CRYPTO_DEV_VIRTIO=m
-CONFIG_CRYPTO_DH=m
+CONFIG_CRYPTO_DH=y
 CONFIG_CRYPTO_DRBG_CTR=y
 CONFIG_CRYPTO_DRBG_HASH=y
 CONFIG_CRYPTO_DRBG_MENU=y
diff --git a/kernel-i686.config b/kernel-i686.config
index 6eefaf0af..345a61fe2 100644
--- a/kernel-i686.config
+++ b/kernel-i686.config
@@ -857,7 +857,7 @@ CONFIG_CRYPTO_DEV_QAT_C62XVF=m
 CONFIG_CRYPTO_DEV_QAT_DH895xCC=m
 CONFIG_CRYPTO_DEV_QAT_DH895xCCVF=m
 CONFIG_CRYPTO_DEV_VIRTIO=m
-CONFIG_CRYPTO_DH=m
+CONFIG_CRYPTO_DH=y
 CONFIG_CRYPTO_DRBG_CTR=y
 CONFIG_CRYPTO_DRBG_HASH=y
 CONFIG_CRYPTO_DRBG_MENU=y
diff --git a/kernel-ppc64-debug.config b/kernel-ppc64-debug.config
index 81070a7df..218c1e23c 100644
--- a/kernel-ppc64-debug.config
+++ b/kernel-ppc64-debug.config
@@ -839,7 +839,7 @@ CONFIG_CRYPTO_DEV_NX=y
 CONFIG_CRYPTO_DEV_VIRTIO=m
 CONFIG_CRYPTO_DEV_VMX_ENCRYPT=m
 CONFIG_CRYPTO_DEV_VMX=y
-CONFIG_CRYPTO_DH=m
+CONFIG_CRYPTO_DH=y
 CONFIG_CRYPTO_DRBG_CTR=y
 CONFIG_CRYPTO_DRBG_HASH=y
 CONFIG_CRYPTO_DRBG_MENU=y
diff --git a/kernel-ppc64.config b/kernel-ppc64.config
index 10f94884b..be2ebe13f 100644
--- a/kernel-ppc64.config
+++ b/kernel-ppc64.config
@@ -837,7 +837,7 @@ CONFIG_CRYPTO_DEV_NX=y
 CONFIG_CRYPTO_DEV_VIRTIO=m
 CONFIG_CRYPTO_DEV_VMX_ENCRYPT=m
 CONFIG_CRYPTO_DEV_VMX=y
-CONFIG_CRYPTO_DH=m
+CONFIG_CRYPTO_DH=y
 CONFIG_CRYPTO_DRBG_CTR=y
 CONFIG_CRYPTO_DRBG_HASH=y
 CONFIG_CRYPTO_DRBG_MENU=y
diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config
index c2b63aea5..2fd4fd6aa 100644
--- a/kernel-ppc64le-debug.config
+++ b/kernel-ppc64le-debug.config
@@ -794,7 +794,7 @@ CONFIG_CRYPTO_DEV_NX=y
 CONFIG_CRYPTO_DEV_VIRTIO=m
 CONFIG_CRYPTO_DEV_VMX_ENCRYPT=m
 CONFIG_CRYPTO_DEV_VMX=y
-CONFIG_CRYPTO_DH=m
+CONFIG_CRYPTO_DH=y
 CONFIG_CRYPTO_DRBG_CTR=y
 CONFIG_CRYPTO_DRBG_HASH=y
 CONFIG_CRYPTO_DRBG_MENU=y
diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config
index cf9d6522a..32e02f042 100644
--- a/kernel-ppc64le.config
+++ b/kernel-ppc64le.config
@@ -792,7 +792,7 @@ CONFIG_CRYPTO_DEV_NX=y
 CONFIG_CRYPTO_DEV_VIRTIO=m
 CONFIG_CRYPTO_DEV_VMX_ENCRYPT=m
 CONFIG_CRYPTO_DEV_VMX=y
-CONFIG_CRYPTO_DH=m
+CONFIG_CRYPTO_DH=y
 CONFIG_CRYPTO_DRBG_CTR=y
 CONFIG_CRYPTO_DRBG_HASH=y
 CONFIG_CRYPTO_DRBG_MENU=y
diff --git a/kernel-ppc64p7-debug.config b/kernel-ppc64p7-debug.config
index ecc026bcf..8e1af389e 100644
--- a/kernel-ppc64p7-debug.config
+++ b/kernel-ppc64p7-debug.config
@@ -794,7 +794,7 @@ CONFIG_CRYPTO_DEV_NX=y
 CONFIG_CRYPTO_DEV_VIRTIO=m
 CONFIG_CRYPTO_DEV_VMX_ENCRYPT=m
 CONFIG_CRYPTO_DEV_VMX=y
-CONFIG_CRYPTO_DH=m
+CONFIG_CRYPTO_DH=y
 CONFIG_CRYPTO_DRBG_CTR=y
 CONFIG_CRYPTO_DRBG_HASH=y
 CONFIG_CRYPTO_DRBG_MENU=y
diff --git a/kernel-ppc64p7.config b/kernel-ppc64p7.config
index 42d53b995..245681434 100644
--- a/kernel-ppc64p7.config
+++ b/kernel-ppc64p7.config
@@ -792,7 +792,7 @@ CONFIG_CRYPTO_DEV_NX=y
 CONFIG_CRYPTO_DEV_VIRTIO=m
 CONFIG_CRYPTO_DEV_VMX_ENCRYPT=m
 CONFIG_CRYPTO_DEV_VMX=y
-CONFIG_CRYPTO_DH=m
+CONFIG_CRYPTO_DH=y
 CONFIG_CRYPTO_DRBG_CTR=y
 CONFIG_CRYPTO_DRBG_HASH=y
 CONFIG_CRYPTO_DRBG_MENU=y
diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config
index 0e2138943..a9a3c1264 100644
--- a/kernel-s390x-debug.config
+++ b/kernel-s390x-debug.config
@@ -784,7 +784,7 @@ CONFIG_CRYPTO_DEV_CHELSIO=m
 CONFIG_CRYPTO_DEV_HIFN_795X=m
 CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y
 CONFIG_CRYPTO_DEV_VIRTIO=m
-CONFIG_CRYPTO_DH=m
+CONFIG_CRYPTO_DH=y
 CONFIG_CRYPTO_DRBG_CTR=y
 CONFIG_CRYPTO_DRBG_HASH=y
 CONFIG_CRYPTO_DRBG_MENU=y
diff --git a/kernel-s390x.config b/kernel-s390x.config
index 293441971..23f78a773 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -782,7 +782,7 @@ CONFIG_CRYPTO_DEV_CHELSIO=m
 CONFIG_CRYPTO_DEV_HIFN_795X=m
 CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y
 CONFIG_CRYPTO_DEV_VIRTIO=m
-CONFIG_CRYPTO_DH=m
+CONFIG_CRYPTO_DH=y
 CONFIG_CRYPTO_DRBG_CTR=y
 CONFIG_CRYPTO_DRBG_HASH=y
 CONFIG_CRYPTO_DRBG_MENU=y
diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config
index c7b0e03d4..08b52a898 100644
--- a/kernel-x86_64-debug.config
+++ b/kernel-x86_64-debug.config
@@ -874,7 +874,7 @@ CONFIG_CRYPTO_DEV_QAT_C62XVF=m
 CONFIG_CRYPTO_DEV_QAT_DH895xCC=m
 CONFIG_CRYPTO_DEV_QAT_DH895xCCVF=m
 CONFIG_CRYPTO_DEV_VIRTIO=m
-CONFIG_CRYPTO_DH=m
+CONFIG_CRYPTO_DH=y
 CONFIG_CRYPTO_DRBG_CTR=y
 CONFIG_CRYPTO_DRBG_HASH=y
 CONFIG_CRYPTO_DRBG_MENU=y
diff --git a/kernel-x86_64.config b/kernel-x86_64.config
index aa2dfed6d..9fedd2042 100644
--- a/kernel-x86_64.config
+++ b/kernel-x86_64.config
@@ -872,7 +872,7 @@ CONFIG_CRYPTO_DEV_QAT_C62XVF=m
 CONFIG_CRYPTO_DEV_QAT_DH895xCC=m
 CONFIG_CRYPTO_DEV_QAT_DH895xCCVF=m
 CONFIG_CRYPTO_DEV_VIRTIO=m
-CONFIG_CRYPTO_DH=m
+CONFIG_CRYPTO_DH=y
 CONFIG_CRYPTO_DRBG_CTR=y
 CONFIG_CRYPTO_DRBG_HASH=y
 CONFIG_CRYPTO_DRBG_MENU=y
diff --git a/kernel.spec b/kernel.spec
index 86b7abc71..f742c3fa3 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -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 4
+%global rcrev 5
 # The git snapshot level
-%define gitrev 3
+%define gitrev 0
 # Set rpm version accordingly
 %define rpmversion 4.%{upstream_sublevel}.0
 %endif
@@ -133,7 +133,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
 
 # Want to build a vanilla kernel build without any non-upstream patches?
 %define with_vanilla %{?_without_vanilla: 0} %{?!_without_vanilla: 1}
@@ -2185,6 +2185,10 @@ fi
 #
 #
 %changelog
+* Mon Jun 12 2017 Justin M. Forbes <jforbes@fedoraproject.org> - 4.12.0-0.rc5.git0.1
+- Linux v4.12-rc5
+- Disable debugging options.
+
 * Fri Jun 09 2017 Laura Abbott <labbott@fedoraproject.org> - 4.12.0-0.rc4.git3.1
 - Linux v4.12-rc4-176-geb4125d
 
diff --git a/sources b/sources
index 91dd4fa7d..2953fbb13 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,3 @@
 SHA512 (perf-man-4.11.tar.gz) = f6dec8c3a296fc5bb1dd58011d7d1340550b9f4f228169bab079b0b36f2d5d96784b808765acda2d547719f6e9fd73b2855ab825dfe4fea8af43c55e5786f8d6
 SHA512 (linux-4.11.tar.xz) = 6610eed97ffb7207c71771198c36179b8244ace7222bebb109507720e26c5f17d918079a56d5febdd8605844d67fb2df0ebe910fa2f2f53690daf6e2a8ad09c3
-SHA512 (patch-4.12-rc4.xz) = ccc100e68d03fdf32ba6d6d874c1e313bfb93f38f369c712e1bb61ed9d44d4ac2a98aca7ea154f0582847fe1668093b02cab6dd2996bd94a8caabc32ab4a6639
-SHA512 (patch-4.12-rc4-git3.xz) = 5277bf7f20c1acea473452e01b0d517109055a6c5baa46c7b104b482599a6fae70c8a1bc36bc1683a57ba4032f2108659e0c0849d4790b29b62fcfac2d5c8a57
+SHA512 (patch-4.12-rc5.xz) = 840b4acf25ea7bab7018f1ad00963c94ce6b92bbada0ec024a32daa5d96ce63f3791633fa400b740ab09b22f4b3ddbd8e153c85c4200044fbc47826b77dcfcb9