From 595bb02d550fc3c2cc56fa99f42178ece9989c9e Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Mon, 7 Mar 2022 14:13:20 -0600 Subject: kernel-5.17-0.rc7.116 * Mon Mar 07 2022 Fedora Kernel Team [5.17-0.rc7.116] - redhat/configs/build_configs.sh: Parallelize execution (Prarit Bhargava) - redhat/configs/build_configs.sh: Provide better messages (Prarit Bhargava) - redhat/configs/build_configs.sh: Create unique output files (Prarit Bhargava) - redhat/configs/build_configs.sh: Add local variables (Prarit Bhargava) - redhat/configs/process_configs.sh: Parallelize execution (Prarit Bhargava) - redhat/configs/process_configs.sh: Provide better messages (Prarit Bhargava) - redhat/configs/process_configs.sh: Create unique output files (Prarit Bhargava) - redhat/configs/process_configs.sh: Add processing config function (Prarit Bhargava) - mm/sparsemem: Fix 'mem_section' will never be NULL gcc 12 warning (Waiman Long) Resolves: rhbz# Signed-off-by: Justin M. Forbes --- Makefile.rhelver | 2 +- Patchlist.changelog | 4 ++-- kernel.spec | 20 ++++++++++++-------- patch-5.17-redhat.patch | 6 +++--- sources | 6 +++--- 5 files changed, 21 insertions(+), 17 deletions(-) diff --git a/Makefile.rhelver b/Makefile.rhelver index c349f4781..a67f070f8 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 = 113 +RHEL_RELEASE = 116 # # Early y+1 numbering diff --git a/Patchlist.changelog b/Patchlist.changelog index 7730722a1..b70cc57d1 100644 --- a/Patchlist.changelog +++ b/Patchlist.changelog @@ -1,5 +1,5 @@ -https://gitlab.com/cki-project/kernel-ark/-/commit/6f72b27d96c5b37b808500dfa4213560003d2036 - 6f72b27d96c5b37b808500dfa4213560003d2036 mm/sparsemem: Fix 'mem_section' will never be NULL gcc 12 warning +https://gitlab.com/cki-project/kernel-ark/-/commit/c261b251c6669be94bb7e9ac8e79377345f2fcf4 + c261b251c6669be94bb7e9ac8e79377345f2fcf4 mm/sparsemem: Fix 'mem_section' will never be NULL gcc 12 warning https://gitlab.com/cki-project/kernel-ark/-/commit/4f79b3c547b8e3dbc014058a8adffe0fe8cd5e4b 4f79b3c547b8e3dbc014058a8adffe0fe8cd5e4b objtool: check: give big enough buffer for pv_ops diff --git a/kernel.spec b/kernel.spec index abadbe8de..65ffecb19 100755 --- a/kernel.spec +++ b/kernel.spec @@ -85,9 +85,9 @@ Summary: The Linux kernel # Set debugbuildsenabled to 0 to not build a separate debug kernel, but # to build the base kernel using the debug configuration. (Specifying # the --with-release option overrides this setting.) -%define debugbuildsenabled 0 +%define debugbuildsenabled 1 -%global distro_build 0.rc6.20220304git38f80f42147f.113 +%global distro_build 0.rc7.116 %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.rc6.20220304git38f80f42147f.113 +%define pkgrelease 0.rc7.116 # This is needed to do merge window version magic %define patchlevel 17 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc6.20220304git38f80f42147f.113%{?buildid}%{?dist} +%define specrelease 0.rc7.116%{?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-rc6-184-g38f80f42147f.tar.xz +Source0: linux-5.17-rc7.tar.xz Source1: Makefile.rhelver @@ -1391,8 +1391,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.17-rc6-184-g38f80f42147f -c -mv linux-5.17-rc6-184-g38f80f42147f linux-%{KVERREL} +%setup -q -n kernel-5.17-rc7 -c +mv linux-5.17-rc7 linux-%{KVERREL} cd linux-%{KVERREL} cp -a %{SOURCE1} . @@ -3005,7 +3005,7 @@ fi # # %changelog -* Fri Mar 04 2022 Fedora Kernel Team [5.17-0.rc6.38f80f42147f.113] +* Mon Mar 07 2022 Fedora Kernel Team [5.17-0.rc7.116] - redhat/configs/build_configs.sh: Parallelize execution (Prarit Bhargava) - redhat/configs/build_configs.sh: Provide better messages (Prarit Bhargava) - redhat/configs/build_configs.sh: Create unique output files (Prarit Bhargava) @@ -3016,6 +3016,10 @@ fi - redhat/configs/process_configs.sh: Add processing config function (Prarit Bhargava) - mm/sparsemem: Fix 'mem_section' will never be NULL gcc 12 warning (Waiman Long) +* Sat Mar 05 2022 Fedora Kernel Team [5.17-0.rc6.ac84e82f78cb.113] +- Add rebase note for 5.17 on Fedora stable (Justin M. Forbes) +- More Fedora config updates for 5.17 (Justin M. Forbes) + * Thu Mar 03 2022 Fedora Kernel Team [5.17-0.rc6.5859a2b19911.111] - redhat/configs: Disable CONFIG_MACINTOSH_DRIVERS in RHEL. (Prarit Bhargava) diff --git a/patch-5.17-redhat.patch b/patch-5.17-redhat.patch index d87640b65..83cd93acd 100644 --- a/patch-5.17-redhat.patch +++ b/patch-5.17-redhat.patch @@ -130,7 +130,7 @@ index 000000000000..effb81d04bfd + +endmenu diff --git a/Makefile b/Makefile -index daeb5c88b50b..82dcc0666407 100644 +index 87f672473523..5ad226acc6b6 100644 --- a/Makefile +++ b/Makefile @@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -238,7 +238,7 @@ index 5ad1dde23dc5..b6192d58eed3 100644 + return !!ipl_secure_flag; +} diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c -index f2c25d113e7b..059fe82e020a 100644 +index 05327be3a982..c473e5ca67f1 100644 --- a/arch/s390/kernel/setup.c +++ b/arch/s390/kernel/setup.c @@ -49,6 +49,7 @@ @@ -249,7 +249,7 @@ index f2c25d113e7b..059fe82e020a 100644 #include #include -@@ -963,6 +964,9 @@ void __init setup_arch(char **cmdline_p) +@@ -965,6 +966,9 @@ void __init setup_arch(char **cmdline_p) log_component_list(); diff --git a/sources b/sources index 7fab240bc..d7747bf20 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-5.17-rc6-184-g38f80f42147f.tar.xz) = a8fbc7f5d47bbc0e1aed64cbc7b5eb8ea09e5d49e55ef604c30f69f69c7d14ce574dbb4b5fd46253224b1581a57208d51e6a01e39fb81a815b2ea3a8c462febe -SHA512 (kernel-abi-stablelists-5.17.0-0.rc6.20220304git38f80f42147f.113.tar.bz2) = e71c91bea82e2bd13083bca4abed5f45ccb07dc1aad13fca363888f86c44c9a9f9ffe69c9465cacfca8c0e76451fb5f2c2b8eef445873af7bb80656de1f10117 -SHA512 (kernel-kabi-dw-5.17.0-0.rc6.20220304git38f80f42147f.113.tar.bz2) = 495eb6a51ccef1b0526292c94eef1e78c92431db1a26f9729f97a78f40441549a0960aabbd141f5e99a070d88d80346cc29e42a61d3b3a7360020698d4f0f984 +SHA512 (linux-5.17-rc7.tar.xz) = 5878a63940d9cc302a3ee38173c217d2f2e784b1e061cdff98bb14cb8914b8ee671e80004146e2061be4ade2aa2742b235c0bce90e08cfabe7d2b740fa3afa8e +SHA512 (kernel-abi-stablelists-5.17.0-0.rc7.116.tar.bz2) = 9a3821b2852818b876f0a18e43c2105f100f36eca6ecdb15cfac5674384f73e891c25a0107651c339b444a181f8e8a776c4933731c00949e7fe00453cf940a8e +SHA512 (kernel-kabi-dw-5.17.0-0.rc7.116.tar.bz2) = 324155ffe06052c4154f50ca437a4f529e268ca5ec3dc6d7975bde68f68d82b4d87ad6ceff12ab42842858a3eeba89c5dabcfbc1473b0f2f4c10c6d5202d3d36 -- cgit