Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.4.0-0.rc6.git2.1.vanilla.knurd.1.fc31

22 files changed, 34 insertions, 21 deletions

diff --git a/configs/fedora/debug/x86/x86_64/CONFIG_NR_CPUS b/configs/fedora/debug/x86/x86_64/CONFIG_NR_CPUS
deleted file mode 100644
index 441191641..000000000
--- a/configs/fedora/debug/x86/x86_64/CONFIG_NR_CPUS
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_NR_CPUS=8192
diff --git a/configs/fedora/debug/x86/x86_64/README b/configs/fedora/debug/x86/x86_64/README
new file mode 100644
index 000000000..fa1c296db
--- /dev/null
+++ b/configs/fedora/debug/x86/x86_64/README
@@ -0,0 +1,2 @@
+Place config options in this directory that you want applied to x86_64
+debug kernel variant.
diff --git a/configs/fedora/generic/arm/CONFIG_MAG3110 b/configs/fedora/generic/arm/CONFIG_MAG3110
new file mode 100644
index 000000000..029f5c044
--- /dev/null
+++ b/configs/fedora/generic/arm/CONFIG_MAG3110
@@ -0,0 +1 @@
+CONFIG_MAG3110=m
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_NR_CPUS b/configs/fedora/generic/arm/aarch64/CONFIG_NR_CPUS
index 0c4b1d904..4190afcbb 100644
--- a/configs/fedora/generic/arm/aarch64/CONFIG_NR_CPUS
+++ b/configs/fedora/generic/arm/aarch64/CONFIG_NR_CPUS
@@ -1 +1 @@
-CONFIG_NR_CPUS=256
+CONFIG_NR_CPUS=4096
diff --git a/configs/fedora/generic/powerpc/CONFIG_NR_CPUS b/configs/fedora/generic/powerpc/CONFIG_NR_CPUS
index 27d187f4d..b13ed41c9 100644
--- a/configs/fedora/generic/powerpc/CONFIG_NR_CPUS
+++ b/configs/fedora/generic/powerpc/CONFIG_NR_CPUS
@@ -1 +1 @@
-CONFIG_NR_CPUS=1024
+CONFIG_NR_CPUS=2048
diff --git a/configs/fedora/generic/s390x/CONFIG_NR_CPUS b/configs/fedora/generic/s390x/CONFIG_NR_CPUS
index fa1ab7e94..9ce2b2de6 100644
--- a/configs/fedora/generic/s390x/CONFIG_NR_CPUS
+++ b/configs/fedora/generic/s390x/CONFIG_NR_CPUS
@@ -1 +1 @@
-CONFIG_NR_CPUS=64
+CONFIG_NR_CPUS=512
diff --git a/configs/fedora/generic/x86/x86_64/CONFIG_KEYBOARD_APPLESPI b/configs/fedora/generic/x86/x86_64/CONFIG_KEYBOARD_APPLESPI
new file mode 100644
index 000000000..b13ce3c0b
--- /dev/null
+++ b/configs/fedora/generic/x86/x86_64/CONFIG_KEYBOARD_APPLESPI
@@ -0,0 +1 @@
+CONFIG_KEYBOARD_APPLESPI=m
diff --git a/gitrev b/gitrev
index 40214f824..722d9b95c 100644
--- a/gitrev
+++ b/gitrev
@@ -1 +1 @@
-e472c64aa4fa6150c6076fd36d101d667d71c30a
+4dd58158254c8a027f2bf5060b72ef64cafa3b9d
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index 44fd375f7..d735470ae 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -3172,7 +3172,7 @@ CONFIG_MAC_PARTITION=y
 CONFIG_MACSEC=m
 CONFIG_MACVLAN=m
 CONFIG_MACVTAP=m
-# CONFIG_MAG3110 is not set
+CONFIG_MAG3110=m
 CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x0
 CONFIG_MAGIC_SYSRQ_SERIAL=y
 CONFIG_MAGIC_SYSRQ=y
@@ -4242,7 +4242,7 @@ CONFIG_NOUVEAU_DEBUG_MMU=y
 # CONFIG_NOUVEAU_LEGACY_CTX_SUPPORT is not set
 CONFIG_NOUVEAU_PLATFORM_DRIVER=y
 CONFIG_NOZOMI=m
-CONFIG_NR_CPUS=256
+CONFIG_NR_CPUS=4096
 CONFIG_NS83820=m
 # CONFIG_NTB is not set
 # CONFIG_NTFS_FS is not set
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index 936585549..104f99094 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -3154,7 +3154,7 @@ CONFIG_MAC_PARTITION=y
 CONFIG_MACSEC=m
 CONFIG_MACVLAN=m
 CONFIG_MACVTAP=m
-# CONFIG_MAG3110 is not set
+CONFIG_MAG3110=m
 CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x0
 CONFIG_MAGIC_SYSRQ_SERIAL=y
 CONFIG_MAGIC_SYSRQ=y
@@ -4222,7 +4222,7 @@ CONFIG_NOUVEAU_DEBUG_DEFAULT=3
 # CONFIG_NOUVEAU_LEGACY_CTX_SUPPORT is not set
 CONFIG_NOUVEAU_PLATFORM_DRIVER=y
 CONFIG_NOZOMI=m
-CONFIG_NR_CPUS=256
+CONFIG_NR_CPUS=4096
 CONFIG_NS83820=m
 # CONFIG_NTB is not set
 # CONFIG_NTFS_FS is not set
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index 51d1176de..0d6a11c76 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -3227,7 +3227,7 @@ CONFIG_MAC_PARTITION=y
 CONFIG_MACSEC=m
 CONFIG_MACVLAN=m
 CONFIG_MACVTAP=m
-# CONFIG_MAG3110 is not set
+CONFIG_MAG3110=m
 CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x0
 CONFIG_MAGIC_SYSRQ_SERIAL=y
 CONFIG_MAGIC_SYSRQ=y
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config
index 4c2df69d1..b7dfc4800 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -3126,7 +3126,7 @@ CONFIG_MAC_PARTITION=y
 CONFIG_MACSEC=m
 CONFIG_MACVLAN=m
 CONFIG_MACVTAP=m
-# CONFIG_MAG3110 is not set
+CONFIG_MAG3110=m
 CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x0
 CONFIG_MAGIC_SYSRQ_SERIAL=y
 CONFIG_MAGIC_SYSRQ=y
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config
index 28dbd970c..7177b848d 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -3109,7 +3109,7 @@ CONFIG_MAC_PARTITION=y
 CONFIG_MACSEC=m
 CONFIG_MACVLAN=m
 CONFIG_MACVTAP=m
-# CONFIG_MAG3110 is not set
+CONFIG_MAG3110=m
 CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x0
 CONFIG_MAGIC_SYSRQ_SERIAL=y
 CONFIG_MAGIC_SYSRQ=y
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index 7cb7ded1a..68df342ff 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -3210,7 +3210,7 @@ CONFIG_MAC_PARTITION=y
 CONFIG_MACSEC=m
 CONFIG_MACVLAN=m
 CONFIG_MACVTAP=m
-# CONFIG_MAG3110 is not set
+CONFIG_MAG3110=m
 CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x0
 CONFIG_MAGIC_SYSRQ_SERIAL=y
 CONFIG_MAGIC_SYSRQ=y
diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config
index a2eee1b93..459d8630b 100644
--- a/kernel-ppc64le-debug.config
+++ b/kernel-ppc64le-debug.config
@@ -3651,7 +3651,7 @@ CONFIG_NOUVEAU_DEBUG_DEFAULT=3
 CONFIG_NOUVEAU_DEBUG_MMU=y
 # CONFIG_NOUVEAU_LEGACY_CTX_SUPPORT is not set
 CONFIG_NOZOMI=m
-CONFIG_NR_CPUS=1024
+CONFIG_NR_CPUS=2048
 CONFIG_NR_IRQS=512
 CONFIG_NS83820=m
 # CONFIG_NTB is not set
diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config
index 6d2e0d4c7..13d8d9d1c 100644
--- a/kernel-ppc64le.config
+++ b/kernel-ppc64le.config
@@ -3630,7 +3630,7 @@ CONFIG_NOUVEAU_DEBUG_DEFAULT=3
 # CONFIG_NOUVEAU_DEBUG_MMU is not set
 # CONFIG_NOUVEAU_LEGACY_CTX_SUPPORT is not set
 CONFIG_NOZOMI=m
-CONFIG_NR_CPUS=1024
+CONFIG_NR_CPUS=2048
 CONFIG_NR_IRQS=512
 CONFIG_NS83820=m
 # CONFIG_NTB is not set
diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config
index 91e129d29..9a2501c95 100644
--- a/kernel-s390x-debug.config
+++ b/kernel-s390x-debug.config
@@ -3624,7 +3624,7 @@ CONFIG_NOUVEAU_DEBUG_DEFAULT=3
 CONFIG_NOUVEAU_DEBUG_MMU=y
 # CONFIG_NOUVEAU_LEGACY_CTX_SUPPORT is not set
 # CONFIG_NOZOMI is not set
-CONFIG_NR_CPUS=64
+CONFIG_NR_CPUS=512
 CONFIG_NS83820=m
 # CONFIG_NTB is not set
 # CONFIG_NTFS_FS is not set
diff --git a/kernel-s390x.config b/kernel-s390x.config
index 44503345b..237b2a434 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -3603,7 +3603,7 @@ CONFIG_NOUVEAU_DEBUG_DEFAULT=3
 # CONFIG_NOUVEAU_DEBUG_MMU is not set
 # CONFIG_NOUVEAU_LEGACY_CTX_SUPPORT is not set
 # CONFIG_NOZOMI is not set
-CONFIG_NR_CPUS=64
+CONFIG_NR_CPUS=512
 CONFIG_NS83820=m
 # CONFIG_NTB is not set
 # CONFIG_NTFS_FS is not set
diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config
index d92cce726..78e443a4c 100644
--- a/kernel-x86_64-debug.config
+++ b/kernel-x86_64-debug.config
@@ -2722,7 +2722,7 @@ CONFIG_KEXEC=y
 # CONFIG_KEYBOARD_ADC is not set
 # CONFIG_KEYBOARD_ADP5588 is not set
 # CONFIG_KEYBOARD_ADP5589 is not set
-# CONFIG_KEYBOARD_APPLESPI is not set
+CONFIG_KEYBOARD_APPLESPI=m
 CONFIG_KEYBOARD_ATKBD=y
 # CONFIG_KEYBOARD_CAP11XX is not set
 CONFIG_KEYBOARD_CROS_EC=m
diff --git a/kernel-x86_64.config b/kernel-x86_64.config
index 2cc2daee1..b5267ba41 100644
--- a/kernel-x86_64.config
+++ b/kernel-x86_64.config
@@ -2703,7 +2703,7 @@ CONFIG_KEXEC=y
 # CONFIG_KEYBOARD_ADC is not set
 # CONFIG_KEYBOARD_ADP5588 is not set
 # CONFIG_KEYBOARD_ADP5589 is not set
-# CONFIG_KEYBOARD_APPLESPI is not set
+CONFIG_KEYBOARD_APPLESPI=m
 CONFIG_KEYBOARD_ATKBD=y
 # CONFIG_KEYBOARD_CAP11XX is not set
 CONFIG_KEYBOARD_CROS_EC=m
diff --git a/kernel.spec b/kernel.spec
index 19573c718..24682375b 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -108,7 +108,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 5.%{upstream_sublevel}.0
 %endif
@@ -195,7 +195,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
 
 %if 0%{?fedora}
 # Kernel headers are being split out into a separate package
@@ -2433,6 +2433,15 @@ fi
 #
 #
 %changelog
+* Thu Nov 07 2019 Jeremy Cline <jcline@redhat.com> - 5.4.0-0.rc6.git2.1
+- Linux v5.4-rc6-26-g4dd58158254c
+
+* Tue Nov 05 2019 Jeremy Cline <jcline@redhat.com> - 5.4.0-0.rc6.git1.1
+- Linux v5.4-rc6-8-g26bc67213424
+
+* Tue Nov 05 2019 Jeremy Cline <jcline@redhat.com>
+- Reenable debugging options.
+
 * Mon Nov 04 2019 Jeremy Cline <jcline@redhat.com> - 5.4.0-0.rc6.git0.1
 - Linux v5.4-rc6
 
diff --git a/sources b/sources
index 825fdefa3..949a5110c 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,3 @@
 SHA512 (linux-5.3.tar.xz) = 6b5edef47c319a3fa7f6c20a3e0903a5acd89ec75e32dc5f99adcb60c9fe118ea312722d9c3d27e2e3900afa2455afb86e83a8b6bb131009bc79ddbe6fb0595d
 SHA512 (patch-5.4-rc6.xz) = 6322ec5b2e5de13fe05abf031dea7274230c3ce77cf93f631dc504eb779f10c6658e8df083a9e96f6eca6f0bf4974bc9b4103d1399eee32c7dedadbab0692d7b
+SHA512 (patch-5.4-rc6-git2.xz) = 523ed8cde342ca49a8ca6f23fbf8f825b9480a49450b587900434290f134270d066eb439c3f1173852eca8d68bb8d17ee0878115830a8aea6fb0f7b0e1b4e377