Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-4.14.0-0.rc7.git1.1.vanilla.knurd.1.fc27kernel-4.14.0-0.rc7.git1.1.vanilla.knurd.1.fc26

10 files changed, 16 insertions, 10 deletions

diff --git a/baseconfig/x86/CONFIG_MAXSMP b/baseconfig/x86/CONFIG_MAXSMP
index 8d0fa581d..d0d71de53 100644
--- a/baseconfig/x86/CONFIG_MAXSMP
+++ b/baseconfig/x86/CONFIG_MAXSMP
@@ -1 +1 @@
-CONFIG_MAXSMP=y
+# CONFIG_MAXSMP is not set
diff --git a/baseconfig/x86/x86_64/CONFIG_NR_CPUS b/baseconfig/x86/x86_64/CONFIG_NR_CPUS
index 441191641..27d187f4d 100644
--- a/baseconfig/x86/x86_64/CONFIG_NR_CPUS
+++ b/baseconfig/x86/x86_64/CONFIG_NR_CPUS
@@ -1 +1 @@
-CONFIG_NR_CPUS=8192
+CONFIG_NR_CPUS=1024
diff --git a/config_generation b/config_generation
index 6708b1022..64ae444f4 100644
--- a/config_generation
+++ b/config_generation
@@ -5,7 +5,7 @@
 
 # x86_64
 x86_64=baseconfig:baseconfig-x86:baseconfig-x86-x86_64
-x86_64-debug=baseconfig:baseconfig-x86:baseconfig-x86-x86_64:debugconfig:debugconfig-x86
+x86_64-debug=baseconfig:baseconfig-x86:baseconfig-x86-x86_64:debugconfig:debugconfig-x86:debugconfig-x86-x86_64
 
 # i686
 i686=baseconfig:baseconfig-x86:baseconfig-x86-i686
diff --git a/debugconfig/x86/x86_64/CONFIG_NR_CPUS b/debugconfig/x86/x86_64/CONFIG_NR_CPUS
new file mode 100644
index 000000000..441191641
--- /dev/null
+++ b/debugconfig/x86/x86_64/CONFIG_NR_CPUS
@@ -0,0 +1 @@
+CONFIG_NR_CPUS=8192
diff --git a/gitrev b/gitrev
index 800cfe931..9da2ff725 100644
--- a/gitrev
+++ b/gitrev
@@ -1 +1 @@
-0b07194bb55ed836c2cc7c22e866b87a14681984
+5f479447d983111c039f1d6d958553c1ad1b2ff1
diff --git a/kernel-i686-PAE.config b/kernel-i686-PAE.config
index c0d237f43..6ad2a0c33 100644
--- a/kernel-i686-PAE.config
+++ b/kernel-i686-PAE.config
@@ -2775,7 +2775,7 @@ CONFIG_MAX30100=m
 # CONFIG_MAX9611 is not set
 # CONFIG_MAXIM_THERMOCOUPLE is not set
 CONFIG_MAX_RAW_DEVS=8192
-CONFIG_MAXSMP=y
+# CONFIG_MAXSMP is not set
 # CONFIG_MC3230 is not set
 # CONFIG_MCB is not set
 # CONFIG_MCE_AMD_INJ is not set
diff --git a/kernel-i686.config b/kernel-i686.config
index dcfa25f71..25361bf95 100644
--- a/kernel-i686.config
+++ b/kernel-i686.config
@@ -2775,7 +2775,7 @@ CONFIG_MAX30100=m
 # CONFIG_MAX9611 is not set
 # CONFIG_MAXIM_THERMOCOUPLE is not set
 CONFIG_MAX_RAW_DEVS=8192
-CONFIG_MAXSMP=y
+# CONFIG_MAXSMP is not set
 # CONFIG_MC3230 is not set
 # CONFIG_MCB is not set
 # CONFIG_MCE_AMD_INJ is not set
diff --git a/kernel-x86_64.config b/kernel-x86_64.config
index 70eef4e26..c353bc4cb 100644
--- a/kernel-x86_64.config
+++ b/kernel-x86_64.config
@@ -2824,7 +2824,7 @@ CONFIG_MAX30100=m
 # CONFIG_MAX9611 is not set
 # CONFIG_MAXIM_THERMOCOUPLE is not set
 CONFIG_MAX_RAW_DEVS=8192
-CONFIG_MAXSMP=y
+# CONFIG_MAXSMP is not set
 # CONFIG_MC3230 is not set
 # CONFIG_MCB is not set
 # CONFIG_MCE_AMD_INJ is not set
@@ -3739,7 +3739,7 @@ CONFIG_NORTEL_HERMES=m
 CONFIG_NOUVEAU_DEBUG=5
 CONFIG_NOUVEAU_DEBUG_DEFAULT=3
 CONFIG_NOZOMI=m
-CONFIG_NR_CPUS=8192
+CONFIG_NR_CPUS=1024
 CONFIG_NR_DEV_DAX=32768
 CONFIG_NS83820=m
 CONFIG_NSC_FIR=m
diff --git a/kernel.spec b/kernel.spec
index 2b6f3c8ec..0232f48d9 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -77,7 +77,7 @@ Summary: The Linux kernel
 # The rc snapshot level
 %global rcrev 7
 # The git snapshot level
-%define gitrev 0
+%define gitrev 1
 # 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}
@@ -2237,6 +2237,10 @@ fi
 #
 #
 %changelog
+* Tue Oct 31 2017 Jeremy Cline <jeremy@jcline.org> - 4.14.0-0.rc7.git1.1
+- Linux v4.14-rc7-8-g5f479447d983
+- Reenable debugging options.
+
 * Mon Oct 30 2017 Justin M. Forbes <jforbes@fedoraproject.org> - 4.14.0-0.rc7.git0.1
 - Linux v4.14-rc7
 
diff --git a/sources b/sources
index cb836c93d..16da72ef5 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-rc7.xz) = 5b078e3c3342f814dc250ac93272262b161b6ec763f76e78314ecff34e047c3db3f10a4764c3d9a15d62938fcdc18a5da76d18caa66ae5c38ae262363f7b73da
+SHA512 (patch-4.14-rc7-git1.xz) = f5fb33fe7e4db7640e2a03f432b2d6eecfcbf39bc85f10fc0900117ccd0ad49fd31328fd1043e069b580f6a818bfc944d91b3d42ce4d13ad9c8d2d16d8241cf3