From 4d39407806f2c1fca6a1645d15deac8b9e855bf6 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Thu, 17 Feb 2022 10:08:49 -0600 Subject: [PATCH] kernel-5.17-0.rc4.f71077a4d84b.99 * Thu Feb 17 2022 Fedora Kernel Team [5.17-0.rc4.f71077a4d84b.99] - mm/sparsemem: Fix 'mem_section' will never be NULL gcc 12 warning (Waiman Long) - tools: Fix use-after-free for realloc(..., 0) (Kees Cook) Resolves: rhbz# Signed-off-by: Justin M. Forbes --- Makefile.rhelver | 2 +- Patchlist.changelog | 8 ++++---- kernel-aarch64-debug-rhel.config | 6 ++---- kernel-aarch64-rhel.config | 6 ++---- kernel-ppc64le-debug-rhel.config | 4 +--- kernel-ppc64le-rhel.config | 4 +--- kernel-s390x-debug-rhel.config | 4 +--- kernel-s390x-rhel.config | 4 +--- kernel-s390x-zfcpdump-rhel.config | 4 +--- kernel-x86_64-debug-rhel.config | 6 +++--- kernel-x86_64-rhel.config | 6 +++--- kernel.spec | 18 +++++++++++------- sources | 6 +++--- 13 files changed, 34 insertions(+), 44 deletions(-) diff --git a/Makefile.rhelver b/Makefile.rhelver index b8f0094c1..d22c9ad34 100644 --- a/Makefile.rhelver +++ b/Makefile.rhelver @@ -12,7 +12,7 @@ RHEL_MINOR = 99 # # Use this spot to avoid future merge conflicts. # Do not trim this comment. -RHEL_RELEASE = 98 +RHEL_RELEASE = 99 # # Early y+1 numbering diff --git a/Patchlist.changelog b/Patchlist.changelog index 96fe3968b..a0b8391cb 100644 --- a/Patchlist.changelog +++ b/Patchlist.changelog @@ -1,8 +1,8 @@ -https://gitlab.com/cki-project/kernel-ark/-/commit/f6776474a40faf40eb2b52e581f930ce3951fcd3 - f6776474a40faf40eb2b52e581f930ce3951fcd3 mm/sparsemem: Fix 'mem_section' will never be NULL gcc 12 warning +https://gitlab.com/cki-project/kernel-ark/-/commit/2698d7b1ae8060e6a86ba4e85434b6ae669ddc27 + 2698d7b1ae8060e6a86ba4e85434b6ae669ddc27 mm/sparsemem: Fix 'mem_section' will never be NULL gcc 12 warning -https://gitlab.com/cki-project/kernel-ark/-/commit/665124f5033c156eaf44a552df7fd6f60c89bd3e - 665124f5033c156eaf44a552df7fd6f60c89bd3e tools: Fix use-after-free for realloc(..., 0) +https://gitlab.com/cki-project/kernel-ark/-/commit/77fe66f6a3104d32911aab0736ec2ff9cee77ea2 + 77fe66f6a3104d32911aab0736ec2ff9cee77ea2 tools: Fix use-after-free for realloc(..., 0) https://gitlab.com/cki-project/kernel-ark/-/commit/4f79b3c547b8e3dbc014058a8adffe0fe8cd5e4b 4f79b3c547b8e3dbc014058a8adffe0fe8cd5e4b objtool: check: give big enough buffer for pv_ops diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config index 5c804545e..618e66853 100644 --- a/kernel-aarch64-debug-rhel.config +++ b/kernel-aarch64-debug-rhel.config @@ -2854,7 +2854,7 @@ CONFIG_LOG_BUF_SHIFT=20 CONFIG_LOG_CPU_MAX_BUF_SHIFT=12 # CONFIG_LOGIG940_FF is not set # CONFIG_LOGIRUMBLEPAD2_FF is not set -# CONFIG_LOGITECH_FF is not set +CONFIG_LOGITECH_FF=y # CONFIG_LOGIWHEELS_FF is not set CONFIG_LOGO_LINUX_CLUT224=y # CONFIG_LOGO_LINUX_MONO is not set @@ -4990,7 +4990,7 @@ CONFIG_SENSORS_MAX31790=m # CONFIG_SENSORS_MP2975 is not set # CONFIG_SENSORS_MP5023 is not set # CONFIG_SENSORS_MR75203 is not set -CONFIG_SENSORS_NCT6683=m +# CONFIG_SENSORS_NCT6683 is not set # CONFIG_SENSORS_NCT6775 is not set CONFIG_SENSORS_NCT7802=m CONFIG_SENSORS_NCT7904=m @@ -5259,8 +5259,6 @@ CONFIG_SND_HDA_PATCH_LOADER=y CONFIG_SND_HDA_POWER_SAVE_DEFAULT=1 CONFIG_SND_HDA_PREALLOC_SIZE=2048 CONFIG_SND_HDA_RECONFIG=y -# CONFIG_SND_HDA_SCODEC_CS35L41_I2C is not set -# CONFIG_SND_HDA_SCODEC_CS35L41_SPI is not set # CONFIG_SND_HDA_TEGRA is not set CONFIG_SND_HDSP=m CONFIG_SND_HDSPM=m diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config index cafe75f72..44f592978 100644 --- a/kernel-aarch64-rhel.config +++ b/kernel-aarch64-rhel.config @@ -2833,7 +2833,7 @@ CONFIG_LOG_BUF_SHIFT=20 CONFIG_LOG_CPU_MAX_BUF_SHIFT=12 # CONFIG_LOGIG940_FF is not set # CONFIG_LOGIRUMBLEPAD2_FF is not set -# CONFIG_LOGITECH_FF is not set +CONFIG_LOGITECH_FF=y # CONFIG_LOGIWHEELS_FF is not set CONFIG_LOGO_LINUX_CLUT224=y # CONFIG_LOGO_LINUX_MONO is not set @@ -4967,7 +4967,7 @@ CONFIG_SENSORS_MAX31790=m # CONFIG_SENSORS_MP2975 is not set # CONFIG_SENSORS_MP5023 is not set # CONFIG_SENSORS_MR75203 is not set -CONFIG_SENSORS_NCT6683=m +# CONFIG_SENSORS_NCT6683 is not set # CONFIG_SENSORS_NCT6775 is not set CONFIG_SENSORS_NCT7802=m CONFIG_SENSORS_NCT7904=m @@ -5236,8 +5236,6 @@ CONFIG_SND_HDA_PATCH_LOADER=y CONFIG_SND_HDA_POWER_SAVE_DEFAULT=1 CONFIG_SND_HDA_PREALLOC_SIZE=2048 CONFIG_SND_HDA_RECONFIG=y -# CONFIG_SND_HDA_SCODEC_CS35L41_I2C is not set -# CONFIG_SND_HDA_SCODEC_CS35L41_SPI is not set # CONFIG_SND_HDA_TEGRA is not set CONFIG_SND_HDSP=m CONFIG_SND_HDSPM=m diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config index 57e1897c6..9f39a2f8b 100644 --- a/kernel-ppc64le-debug-rhel.config +++ b/kernel-ppc64le-debug-rhel.config @@ -2682,7 +2682,7 @@ CONFIG_LOG_BUF_SHIFT=20 CONFIG_LOG_CPU_MAX_BUF_SHIFT=12 # CONFIG_LOGIG940_FF is not set # CONFIG_LOGIRUMBLEPAD2_FF is not set -# CONFIG_LOGITECH_FF is not set +CONFIG_LOGITECH_FF=y # CONFIG_LOGIWHEELS_FF is not set CONFIG_LOGO_LINUX_CLUT224=y # CONFIG_LOGO_LINUX_MONO is not set @@ -5039,8 +5039,6 @@ CONFIG_SND_HDA_PATCH_LOADER=y CONFIG_SND_HDA_POWER_SAVE_DEFAULT=1 CONFIG_SND_HDA_PREALLOC_SIZE=2048 CONFIG_SND_HDA_RECONFIG=y -# CONFIG_SND_HDA_SCODEC_CS35L41_I2C is not set -# CONFIG_SND_HDA_SCODEC_CS35L41_SPI is not set # CONFIG_SND_HDA_TEGRA is not set CONFIG_SND_HDSP=m CONFIG_SND_HDSPM=m diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config index 59b92e492..b45968c6d 100644 --- a/kernel-ppc64le-rhel.config +++ b/kernel-ppc64le-rhel.config @@ -2664,7 +2664,7 @@ CONFIG_LOG_BUF_SHIFT=20 CONFIG_LOG_CPU_MAX_BUF_SHIFT=12 # CONFIG_LOGIG940_FF is not set # CONFIG_LOGIRUMBLEPAD2_FF is not set -# CONFIG_LOGITECH_FF is not set +CONFIG_LOGITECH_FF=y # CONFIG_LOGIWHEELS_FF is not set CONFIG_LOGO_LINUX_CLUT224=y # CONFIG_LOGO_LINUX_MONO is not set @@ -5020,8 +5020,6 @@ CONFIG_SND_HDA_PATCH_LOADER=y CONFIG_SND_HDA_POWER_SAVE_DEFAULT=1 CONFIG_SND_HDA_PREALLOC_SIZE=2048 CONFIG_SND_HDA_RECONFIG=y -# CONFIG_SND_HDA_SCODEC_CS35L41_I2C is not set -# CONFIG_SND_HDA_SCODEC_CS35L41_SPI is not set # CONFIG_SND_HDA_TEGRA is not set CONFIG_SND_HDSP=m CONFIG_SND_HDSPM=m diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config index 921f29a94..5f37d1db0 100644 --- a/kernel-s390x-debug-rhel.config +++ b/kernel-s390x-debug-rhel.config @@ -2660,7 +2660,7 @@ CONFIG_LOG_BUF_SHIFT=17 CONFIG_LOG_CPU_MAX_BUF_SHIFT=12 # CONFIG_LOGIG940_FF is not set # CONFIG_LOGIRUMBLEPAD2_FF is not set -# CONFIG_LOGITECH_FF is not set +CONFIG_LOGITECH_FF=y # CONFIG_LOGIWHEELS_FF is not set # CONFIG_LOGO is not set CONFIG_LOGO_LINUX_CLUT224=y @@ -4985,8 +4985,6 @@ CONFIG_SND_HDA_PATCH_LOADER=y CONFIG_SND_HDA_POWER_SAVE_DEFAULT=1 CONFIG_SND_HDA_PREALLOC_SIZE=2048 CONFIG_SND_HDA_RECONFIG=y -# CONFIG_SND_HDA_SCODEC_CS35L41_I2C is not set -# CONFIG_SND_HDA_SCODEC_CS35L41_SPI is not set # CONFIG_SND_HDA_TEGRA is not set CONFIG_SND_HDSP=m CONFIG_SND_HDSPM=m diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config index a36f2d72b..45e2f84eb 100644 --- a/kernel-s390x-rhel.config +++ b/kernel-s390x-rhel.config @@ -2642,7 +2642,7 @@ CONFIG_LOG_BUF_SHIFT=17 CONFIG_LOG_CPU_MAX_BUF_SHIFT=12 # CONFIG_LOGIG940_FF is not set # CONFIG_LOGIRUMBLEPAD2_FF is not set -# CONFIG_LOGITECH_FF is not set +CONFIG_LOGITECH_FF=y # CONFIG_LOGIWHEELS_FF is not set # CONFIG_LOGO is not set CONFIG_LOGO_LINUX_CLUT224=y @@ -4966,8 +4966,6 @@ CONFIG_SND_HDA_PATCH_LOADER=y CONFIG_SND_HDA_POWER_SAVE_DEFAULT=1 CONFIG_SND_HDA_PREALLOC_SIZE=2048 CONFIG_SND_HDA_RECONFIG=y -# CONFIG_SND_HDA_SCODEC_CS35L41_I2C is not set -# CONFIG_SND_HDA_SCODEC_CS35L41_SPI is not set # CONFIG_SND_HDA_TEGRA is not set CONFIG_SND_HDSP=m CONFIG_SND_HDSPM=m diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config index 0131aaefb..3bd87b815 100644 --- a/kernel-s390x-zfcpdump-rhel.config +++ b/kernel-s390x-zfcpdump-rhel.config @@ -2655,7 +2655,7 @@ CONFIG_LOG_BUF_SHIFT=16 CONFIG_LOG_CPU_MAX_BUF_SHIFT=12 # CONFIG_LOGIG940_FF is not set # CONFIG_LOGIRUMBLEPAD2_FF is not set -# CONFIG_LOGITECH_FF is not set +CONFIG_LOGITECH_FF=y # CONFIG_LOGIWHEELS_FF is not set # CONFIG_LOGO is not set CONFIG_LOGO_LINUX_CLUT224=y @@ -4988,8 +4988,6 @@ CONFIG_SND_HDA_PATCH_LOADER=y CONFIG_SND_HDA_POWER_SAVE_DEFAULT=1 CONFIG_SND_HDA_PREALLOC_SIZE=2048 CONFIG_SND_HDA_RECONFIG=y -# CONFIG_SND_HDA_SCODEC_CS35L41_I2C is not set -# CONFIG_SND_HDA_SCODEC_CS35L41_SPI is not set # CONFIG_SND_HDA_TEGRA is not set CONFIG_SND_HDSP=m CONFIG_SND_HDSPM=m diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config index 041f888cb..87a7cff84 100644 --- a/kernel-x86_64-debug-rhel.config +++ b/kernel-x86_64-debug-rhel.config @@ -2846,7 +2846,7 @@ CONFIG_LOG_BUF_SHIFT=20 CONFIG_LOG_CPU_MAX_BUF_SHIFT=12 # CONFIG_LOGIG940_FF is not set # CONFIG_LOGIRUMBLEPAD2_FF is not set -# CONFIG_LOGITECH_FF is not set +CONFIG_LOGITECH_FF=y # CONFIG_LOGIWHEELS_FF is not set CONFIG_LOGO_LINUX_CLUT224=y # CONFIG_LOGO_LINUX_MONO is not set @@ -5206,8 +5206,8 @@ CONFIG_SND_HDA_PATCH_LOADER=y CONFIG_SND_HDA_POWER_SAVE_DEFAULT=1 CONFIG_SND_HDA_PREALLOC_SIZE=0 CONFIG_SND_HDA_RECONFIG=y -# CONFIG_SND_HDA_SCODEC_CS35L41_I2C is not set -# CONFIG_SND_HDA_SCODEC_CS35L41_SPI is not set +CONFIG_SND_HDA_SCODEC_CS35L41_I2C=m +CONFIG_SND_HDA_SCODEC_CS35L41_SPI=m # CONFIG_SND_HDA_TEGRA is not set CONFIG_SND_HDSP=m CONFIG_SND_HDSPM=m diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config index 33c169aeb..f037389dc 100644 --- a/kernel-x86_64-rhel.config +++ b/kernel-x86_64-rhel.config @@ -2826,7 +2826,7 @@ CONFIG_LOG_BUF_SHIFT=20 CONFIG_LOG_CPU_MAX_BUF_SHIFT=12 # CONFIG_LOGIG940_FF is not set # CONFIG_LOGIRUMBLEPAD2_FF is not set -# CONFIG_LOGITECH_FF is not set +CONFIG_LOGITECH_FF=y # CONFIG_LOGIWHEELS_FF is not set CONFIG_LOGO_LINUX_CLUT224=y # CONFIG_LOGO_LINUX_MONO is not set @@ -5184,8 +5184,8 @@ CONFIG_SND_HDA_PATCH_LOADER=y CONFIG_SND_HDA_POWER_SAVE_DEFAULT=1 CONFIG_SND_HDA_PREALLOC_SIZE=0 CONFIG_SND_HDA_RECONFIG=y -# CONFIG_SND_HDA_SCODEC_CS35L41_I2C is not set -# CONFIG_SND_HDA_SCODEC_CS35L41_SPI is not set +CONFIG_SND_HDA_SCODEC_CS35L41_I2C=m +CONFIG_SND_HDA_SCODEC_CS35L41_SPI=m # CONFIG_SND_HDA_TEGRA is not set CONFIG_SND_HDSP=m CONFIG_SND_HDSPM=m diff --git a/kernel.spec b/kernel.spec index 73b1f9dd3..36918b4c1 100755 --- a/kernel.spec +++ b/kernel.spec @@ -87,7 +87,7 @@ Summary: The Linux kernel # the --with-release option overrides this setting.) %define debugbuildsenabled 0 -%global distro_build 0.rc4.20220216gitc5d9ae265b10.98 +%global distro_build 0.rc4.20220217gitf71077a4d84b.99 %if 0%{?fedora} %define secure_boot_arch x86_64 @@ -132,13 +132,13 @@ Summary: The Linux kernel %define rpmversion 5.17.0 %define patchversion 5.17 -%define pkgrelease 0.rc4.20220216gitc5d9ae265b10.98 +%define pkgrelease 0.rc4.20220217gitf71077a4d84b.99 # This is needed to do merge window version magic %define patchlevel 17 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc4.20220216gitc5d9ae265b10.98%{?buildid}%{?dist} +%define specrelease 0.rc4.20220217gitf71077a4d84b.99%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -695,7 +695,7 @@ BuildRequires: lld # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-5.17-rc4-51-gc5d9ae265b10.tar.xz +Source0: linux-5.17-rc4-54-gf71077a4d84b.tar.xz Source1: Makefile.rhelver @@ -1391,8 +1391,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.17-rc4-51-gc5d9ae265b10 -c -mv linux-5.17-rc4-51-gc5d9ae265b10 linux-%{KVERREL} +%setup -q -n kernel-5.17-rc4-54-gf71077a4d84b -c +mv linux-5.17-rc4-54-gf71077a4d84b linux-%{KVERREL} cd linux-%{KVERREL} cp -a %{SOURCE1} . @@ -3005,10 +3005,14 @@ fi # # %changelog -* Wed Feb 16 2022 Fedora Kernel Team [5.17-0.rc4.c5d9ae265b10.98] +* Thu Feb 17 2022 Fedora Kernel Team [5.17-0.rc4.f71077a4d84b.99] - mm/sparsemem: Fix 'mem_section' will never be NULL gcc 12 warning (Waiman Long) - tools: Fix use-after-free for realloc(..., 0) (Kees Cook) +* Thu Feb 17 2022 Fedora Kernel Team [5.17-0.rc4.f71077a4d84b.98] +- configs: enable LOGITECH_FF for RHEL/CentOS too (Benjamin Tissoires) +- redhat/configs: Disable CONFIG_SENSORS_NCT6683 in RHEL for arm/aarch64 (Dean Nelson) [2041186] + * Sun Feb 13 2022 Fedora Kernel Team [5.17-0.rc3.b81b1829e7e3.94] - redhat: fix make {distg-brew,distg-koji} (Andrea Claudi) diff --git a/sources b/sources index 622c9608e..ca7e58b8f 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-5.17-rc4-51-gc5d9ae265b10.tar.xz) = 0525dbecbc0492d70e8f248ddde39497da88a3d90b9b3f8de5b21ad8119f76de12f3226a2bc9ca9febedb8f7c4907f6fdd425f83152ea219ec1d2765790d6459 -SHA512 (kernel-abi-stablelists-5.17.0-0.rc4.20220216gitc5d9ae265b10.98.tar.bz2) = 82fc0954c6dccddd134f9f3e41c9e017660c6588c4c6653dbd1bb0ef63e53faa255c357a59410ada4b2f5856ee8273a95a13b9cc8e00b915187166a1f09c6a17 -SHA512 (kernel-kabi-dw-5.17.0-0.rc4.20220216gitc5d9ae265b10.98.tar.bz2) = 85074095e5f81ad32584de48a35c8329d2f2557bfee1fe6880a2714f64886d5aea806fc208c2d8baaf7404152b3f6c070352d042742952ce3ac9c49ae1d58037 +SHA512 (linux-5.17-rc4-54-gf71077a4d84b.tar.xz) = a6da6afd403e714e25a08a46d314bc7cdd47a7988bf4da3cb103575f98c5eddeeb24d95afaaec959aff7356947c1e09102079395a2e9d2dedea9ab8330ff0ca6 +SHA512 (kernel-abi-stablelists-5.17.0-0.rc4.20220217gitf71077a4d84b.99.tar.bz2) = d36ab7ece3945e4b8e55e259731352557bf65f8c527295e92a88a9dd39fca0510014140d5ed699c3c26ec88822e69118b84496773926651022130c207e32735b +SHA512 (kernel-kabi-dw-5.17.0-0.rc4.20220217gitf71077a4d84b.99.tar.bz2) = be0f1aae2831bff849412fca349ef153cfc8364a15f311f777b676d520303ea7b6fe4aafeb4cd41e3b6691415bc239cf72defdd2ebbbbc1980b86cafbb6a7b4a