From 806e674c8d80ae305655326865ccea2b3e4fb38c Mon Sep 17 00:00:00 2001 From: Jeremy Cline Date: Mon, 4 Nov 2019 11:52:53 -0500 Subject: Update NR_CPUS for aarch64, powerpc, and s390x This aligns the setting with upstream defconfigs along with the ARK configuration. --- configs/fedora/debug/x86/x86_64/CONFIG_NR_CPUS | 1 - configs/fedora/generic/arm/aarch64/CONFIG_NR_CPUS | 2 +- configs/fedora/generic/powerpc/CONFIG_NR_CPUS | 2 +- configs/fedora/generic/s390x/CONFIG_NR_CPUS | 2 +- kernel-aarch64-debug.config | 2 +- kernel-aarch64.config | 2 +- kernel-ppc64le-debug.config | 2 +- kernel-ppc64le.config | 2 +- kernel-s390x-debug.config | 2 +- kernel-s390x.config | 2 +- 10 files changed, 9 insertions(+), 10 deletions(-) delete mode 100644 configs/fedora/debug/x86/x86_64/CONFIG_NR_CPUS 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/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/kernel-aarch64-debug.config b/kernel-aarch64-debug.config index 44fd375f7..07fb9a6d3 100644 --- a/kernel-aarch64-debug.config +++ b/kernel-aarch64-debug.config @@ -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..91ef95f8b 100644 --- a/kernel-aarch64.config +++ b/kernel-aarch64.config @@ -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-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 -- cgit From 7f0a66bf5c74d912b56bd79d9fae462552e880a5 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 4 Nov 2019 17:48:28 +0000 Subject: enable iio:MAG3110 on arm --- configs/fedora/generic/arm/CONFIG_MAG3110 | 1 + kernel-aarch64-debug.config | 2 +- kernel-aarch64.config | 2 +- kernel-armv7hl-debug.config | 2 +- kernel-armv7hl-lpae-debug.config | 2 +- kernel-armv7hl-lpae.config | 2 +- kernel-armv7hl.config | 2 +- 7 files changed, 7 insertions(+), 6 deletions(-) create mode 100644 configs/fedora/generic/arm/CONFIG_MAG3110 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/kernel-aarch64-debug.config b/kernel-aarch64-debug.config index 44fd375f7..bc8c2bc1a 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 diff --git a/kernel-aarch64.config b/kernel-aarch64.config index 936585549..405aee055 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 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 -- cgit From dc01cc3a4cfe86a0495406f47f04ea7ee601993e Mon Sep 17 00:00:00 2001 From: Jeremy Cline Date: Tue, 5 Nov 2019 16:42:37 -0500 Subject: Reenable debugging options. --- kernel.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kernel.spec b/kernel.spec index 407167f8f..d1d3cf275 100644 --- a/kernel.spec +++ b/kernel.spec @@ -187,7 +187,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 @@ -2413,6 +2413,9 @@ fi # # %changelog +* Tue Nov 05 2019 Jeremy Cline +- Reenable debugging options. + * Mon Nov 04 2019 Jeremy Cline - 5.4.0-0.rc6.git0.1 - Linux v5.4-rc6 -- cgit From cf93fd5615591912c3e82f0e306d1d4e0e531be3 Mon Sep 17 00:00:00 2001 From: Jeremy Cline Date: Tue, 5 Nov 2019 17:02:20 -0500 Subject: Linux v5.4-rc6-8-g26bc67213424 --- configs/fedora/debug/x86/x86_64/README | 2 ++ gitrev | 2 +- kernel.spec | 5 ++++- sources | 1 + 4 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 configs/fedora/debug/x86/x86_64/README 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/gitrev b/gitrev index 40214f824..d623657ad 100644 --- a/gitrev +++ b/gitrev @@ -1 +1 @@ -e472c64aa4fa6150c6076fd36d101d667d71c30a +26bc672134241a080a83b2ab9aa8abede8d30e1c diff --git a/kernel.spec b/kernel.spec index d1d3cf275..7f6f843e1 100644 --- a/kernel.spec +++ b/kernel.spec @@ -100,7 +100,7 @@ Summary: The Linux kernel # The rc snapshot level %global rcrev 6 # The git snapshot level -%define gitrev 0 +%define gitrev 1 # Set rpm version accordingly %define rpmversion 5.%{upstream_sublevel}.0 %endif @@ -2413,6 +2413,9 @@ fi # # %changelog +* Tue Nov 05 2019 Jeremy Cline - 5.4.0-0.rc6.git1.1 +- Linux v5.4-rc6-8-g26bc67213424 + * Tue Nov 05 2019 Jeremy Cline - Reenable debugging options. diff --git a/sources b/sources index 825fdefa3..747b91248 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-git1.xz) = aedc50747a852f7aaf5260254c7ced2575fe5eb4368bc981f0f490fcb9d34f7f081f794ce50c630eb055a08a65300cfdd3fa548aefa114c739813a97027e8ced -- cgit From c0ae175a90e224bb366382c919a6584447c5598c Mon Sep 17 00:00:00 2001 From: Jeremy Cline Date: Thu, 7 Nov 2019 11:19:36 -0500 Subject: Enable the Apple SPI driver for keyboard/touchpad (rhbz 1769465) This enables support for Macbook8,1 and later, along with the MacbookPro13,* and MacbookPro14,*. --- configs/fedora/generic/x86/x86_64/CONFIG_KEYBOARD_APPLESPI | 1 + kernel-x86_64-debug.config | 2 +- kernel-x86_64.config | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 configs/fedora/generic/x86/x86_64/CONFIG_KEYBOARD_APPLESPI 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/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 -- cgit From 6b0750a9a3cb4ce47aebfd84bc9a9aebd0a6bfe8 Mon Sep 17 00:00:00 2001 From: Jeremy Cline Date: Thu, 7 Nov 2019 11:25:34 -0500 Subject: Linux v5.4-rc6-26-g4dd58158254c --- gitrev | 2 +- kernel.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/gitrev b/gitrev index d623657ad..722d9b95c 100644 --- a/gitrev +++ b/gitrev @@ -1 +1 @@ -26bc672134241a080a83b2ab9aa8abede8d30e1c +4dd58158254c8a027f2bf5060b72ef64cafa3b9d diff --git a/kernel.spec b/kernel.spec index 7f6f843e1..a1d026014 100644 --- a/kernel.spec +++ b/kernel.spec @@ -100,7 +100,7 @@ Summary: The Linux kernel # The rc snapshot level %global rcrev 6 # The git snapshot level -%define gitrev 1 +%define gitrev 2 # Set rpm version accordingly %define rpmversion 5.%{upstream_sublevel}.0 %endif @@ -2413,6 +2413,9 @@ fi # # %changelog +* Thu Nov 07 2019 Jeremy Cline - 5.4.0-0.rc6.git2.1 +- Linux v5.4-rc6-26-g4dd58158254c + * Tue Nov 05 2019 Jeremy Cline - 5.4.0-0.rc6.git1.1 - Linux v5.4-rc6-8-g26bc67213424 diff --git a/sources b/sources index 747b91248..949a5110c 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ SHA512 (linux-5.3.tar.xz) = 6b5edef47c319a3fa7f6c20a3e0903a5acd89ec75e32dc5f99adcb60c9fe118ea312722d9c3d27e2e3900afa2455afb86e83a8b6bb131009bc79ddbe6fb0595d SHA512 (patch-5.4-rc6.xz) = 6322ec5b2e5de13fe05abf031dea7274230c3ce77cf93f631dc504eb779f10c6658e8df083a9e96f6eca6f0bf4974bc9b4103d1399eee32c7dedadbab0692d7b -SHA512 (patch-5.4-rc6-git1.xz) = aedc50747a852f7aaf5260254c7ced2575fe5eb4368bc981f0f490fcb9d34f7f081f794ce50c630eb055a08a65300cfdd3fa548aefa114c739813a97027e8ced +SHA512 (patch-5.4-rc6-git2.xz) = 523ed8cde342ca49a8ca6f23fbf8f825b9480a49450b587900434290f134270d066eb439c3f1173852eca8d68bb8d17ee0878115830a8aea6fb0f7b0e1b4e377 -- cgit