Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-4.14.0-0.rc6.git2.1.vanilla.knurd.1.fc28kernel-4.14.0-0.rc6.git2.1.vanilla.knurd.1.fc27kernel-4.14.0-0.rc6.git2.1.vanilla.knurd.1.fc26kernel-4.14.0-0.rc6.git2.1.vanilla.knurd.1.fc25

3 files changed, 11 insertions, 3 deletions

diff --git a/gitrev b/gitrev
index fbf66c048..5539114b7 100644
--- a/gitrev
+++ b/gitrev
@@ -1 +1 @@
-9a27ded2195aaec2041ed2525ba7f373c60920c7
+f34157878d3b17641ad2366988600c23c89d98b2
diff --git a/kernel.spec b/kernel.spec
index 1e6c5463f..a2158f459 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -77,7 +77,7 @@ Summary: The Linux kernel
 # The rc snapshot level
 %global rcrev 6
 # The git snapshot level
-%define gitrev 0
+%define gitrev 2
 # 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 1
+%define debugbuildsenabled 0
 
 # Want to build a vanilla kernel build without any non-upstream patches?
 %define with_vanilla %{?_without_vanilla: 0} %{?!_without_vanilla: 1}
@@ -2232,6 +2232,13 @@ fi
 #
 #
 %changelog
+* Wed Oct 25 2017 Justin M. Forbes <jforbes@fedoraproject.org> - 4.14.0-0.rc6.git2.1
+- Linux v4.14-rc6-21-gf34157878d3b
+
+* Tue Oct 24 2017 Justin M. Forbes <jforbes@fedoraproject.org> - 4.14.0-0.rc6.git1.1
+- Linux v4.14-rc6-18-gae59df0349ba
+- Reenable debugging options.
+
 * Mon Oct 23 2017 Justin M. Forbes <jforbes@fedoraproject.org> - 4.14.0-0.rc6.git0.1
 - Linux v4.14-rc6
 
diff --git a/sources b/sources
index 40da399a7..094bf403a 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,4 @@
 SHA512 (linux-4.13.tar.xz) = a557c2f0303ae618910b7106ff63d9978afddf470f03cb72aa748213e099a0ecd5f3119aea6cbd7b61df30ca6ef3ec57044d524b7babbaabddf8b08b8bafa7d2
 SHA512 (perf-man-4.13.tar.gz) = 9bcc2cd8e56ec583ed2d8e0b0c88e7a94035a1915e40b3177bb02d6c0f10ddd4df9b097b1f5af59efc624226b613e240ddba8ddc2156f3682f992d5455fc5c03
 SHA512 (patch-4.14-rc6.xz) = f10d13b0bd4f5e3bf295d4ef779cf358011e05c124b06277fef8afcf1a591b147f62717f0128866412fdd7ddddd660c0ae4b82b02b95702f10aabf50292c0ae7
+SHA512 (patch-4.14-rc6-git2.xz) = 3cc8177ac31f1ac1d12522a8da7c05e25ccc630e5468ea267151acf5291ee9cf6196abb790bee742319bdbbe5180c6bbaad24245bb55f4eb315e6b179a19621b