From 6c1abf676776bc0233d9952a95eca64018a13a39 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Wed, 2 Mar 2022 15:00:45 -0600 Subject: kernel-5.17-0.rc6.fb184c4af9b9.111 * Wed Mar 02 2022 Fedora Kernel Team [5.17-0.rc6.fb184c4af9b9.111] - 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-aarch64-debug-fedora.config | 1 - kernel-aarch64-debug-rhel.config | 1 - kernel-aarch64-fedora.config | 1 - kernel-aarch64-rhel.config | 1 - kernel-armv7hl-debug-fedora.config | 1 - kernel-armv7hl-fedora.config | 1 - kernel-armv7hl-lpae-debug-fedora.config | 1 - kernel-armv7hl-lpae-fedora.config | 1 - kernel-ppc64le-debug-fedora.config | 1 - kernel-ppc64le-debug-rhel.config | 1 - kernel-ppc64le-fedora.config | 1 - kernel-ppc64le-rhel.config | 1 - kernel-s390x-debug-fedora.config | 1 - kernel-s390x-debug-rhel.config | 1 - kernel-s390x-fedora.config | 1 - kernel-s390x-rhel.config | 1 - kernel-s390x-zfcpdump-rhel.config | 1 - kernel-x86_64-debug-rhel.config | 2 +- kernel-x86_64-rhel.config | 2 +- kernel.spec | 25 ++++++++++++++----------- sources | 6 +++--- 23 files changed, 22 insertions(+), 36 deletions(-) diff --git a/Makefile.rhelver b/Makefile.rhelver index ce9d6d244..6d8a6676c 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 = 109 +RHEL_RELEASE = 111 # # Early y+1 numbering diff --git a/Patchlist.changelog b/Patchlist.changelog index cf663f1b3..a22b0a890 100644 --- a/Patchlist.changelog +++ b/Patchlist.changelog @@ -1,5 +1,5 @@ -https://gitlab.com/cki-project/kernel-ark/-/commit/85f291511c477e2e355b084687e113bb015fb5f6 - 85f291511c477e2e355b084687e113bb015fb5f6 mm/sparsemem: Fix 'mem_section' will never be NULL gcc 12 warning +https://gitlab.com/cki-project/kernel-ark/-/commit/f044b2d574e19fdb4549787138788ea9eef94bd2 + f044b2d574e19fdb4549787138788ea9eef94bd2 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-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config index 683965672..312e4450e 100644 --- a/kernel-aarch64-debug-fedora.config +++ b/kernel-aarch64-debug-fedora.config @@ -3019,7 +3019,6 @@ CONFIG_INTEL_SOC_PMIC_CHTDC_TI=m # CONFIG_INTEL_TCC_COOLING is not set # CONFIG_INTEL_TH is not set CONFIG_INTEL_UNCORE_FREQ_CONTROL=m -# CONFIG_INTEL_VSEC is not set # CONFIG_INTEL_WMI_SBL_FW_UPDATE is not set CONFIG_INTEL_XWAY_PHY=m CONFIG_INTERCONNECT_IMX8MM=m diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config index 8b38fb5d2..ea1bb324f 100644 --- a/kernel-aarch64-debug-rhel.config +++ b/kernel-aarch64-debug-rhel.config @@ -2384,7 +2384,6 @@ CONFIG_INTEL_RST=m # CONFIG_INTEL_TH is not set CONFIG_INTEL_TURBO_MAX_3=y CONFIG_INTEL_UNCORE_FREQ_CONTROL=m -# CONFIG_INTEL_VSEC is not set # CONFIG_INTEL_WMI_SBL_FW_UPDATE is not set CONFIG_INTEL_WMI_THUNDERBOLT=m CONFIG_INTEL_XWAY_PHY=m diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config index 31bda812d..f67f78517 100644 --- a/kernel-aarch64-fedora.config +++ b/kernel-aarch64-fedora.config @@ -3003,7 +3003,6 @@ CONFIG_INTEL_SOC_PMIC_CHTDC_TI=m # CONFIG_INTEL_TCC_COOLING is not set # CONFIG_INTEL_TH is not set CONFIG_INTEL_UNCORE_FREQ_CONTROL=m -# CONFIG_INTEL_VSEC is not set # CONFIG_INTEL_WMI_SBL_FW_UPDATE is not set CONFIG_INTEL_XWAY_PHY=m CONFIG_INTERCONNECT_IMX8MM=m diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config index 028098789..ca3fd55f1 100644 --- a/kernel-aarch64-rhel.config +++ b/kernel-aarch64-rhel.config @@ -2368,7 +2368,6 @@ CONFIG_INTEL_RST=m # CONFIG_INTEL_TH is not set CONFIG_INTEL_TURBO_MAX_3=y CONFIG_INTEL_UNCORE_FREQ_CONTROL=m -# CONFIG_INTEL_VSEC is not set # CONFIG_INTEL_WMI_SBL_FW_UPDATE is not set CONFIG_INTEL_WMI_THUNDERBOLT=m CONFIG_INTEL_XWAY_PHY=m diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config index 6093e5dca..55b3dcab3 100644 --- a/kernel-armv7hl-debug-fedora.config +++ b/kernel-armv7hl-debug-fedora.config @@ -3046,7 +3046,6 @@ CONFIG_INTEL_SOC_PMIC_CHTDC_TI=m # CONFIG_INTEL_TCC_COOLING is not set # CONFIG_INTEL_TH is not set CONFIG_INTEL_UNCORE_FREQ_CONTROL=m -# CONFIG_INTEL_VSEC is not set # CONFIG_INTEL_WMI_SBL_FW_UPDATE is not set CONFIG_INTEL_XWAY_PHY=m CONFIG_INTERCONNECT_EXYNOS=y diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config index 187d1dc8b..6e58534a1 100644 --- a/kernel-armv7hl-fedora.config +++ b/kernel-armv7hl-fedora.config @@ -3031,7 +3031,6 @@ CONFIG_INTEL_SOC_PMIC_CHTDC_TI=m # CONFIG_INTEL_TCC_COOLING is not set # CONFIG_INTEL_TH is not set CONFIG_INTEL_UNCORE_FREQ_CONTROL=m -# CONFIG_INTEL_VSEC is not set # CONFIG_INTEL_WMI_SBL_FW_UPDATE is not set CONFIG_INTEL_XWAY_PHY=m CONFIG_INTERCONNECT_EXYNOS=y diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config index 4be1f6170..6a5821f7d 100644 --- a/kernel-armv7hl-lpae-debug-fedora.config +++ b/kernel-armv7hl-lpae-debug-fedora.config @@ -2982,7 +2982,6 @@ CONFIG_INTEL_SOC_PMIC_CHTDC_TI=m # CONFIG_INTEL_TCC_COOLING is not set # CONFIG_INTEL_TH is not set CONFIG_INTEL_UNCORE_FREQ_CONTROL=m -# CONFIG_INTEL_VSEC is not set # CONFIG_INTEL_WMI_SBL_FW_UPDATE is not set CONFIG_INTEL_XWAY_PHY=m CONFIG_INTERCONNECT_EXYNOS=y diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config index b6f69cf2c..c5a9ac9ed 100644 --- a/kernel-armv7hl-lpae-fedora.config +++ b/kernel-armv7hl-lpae-fedora.config @@ -2967,7 +2967,6 @@ CONFIG_INTEL_SOC_PMIC_CHTDC_TI=m # CONFIG_INTEL_TCC_COOLING is not set # CONFIG_INTEL_TH is not set CONFIG_INTEL_UNCORE_FREQ_CONTROL=m -# CONFIG_INTEL_VSEC is not set # CONFIG_INTEL_WMI_SBL_FW_UPDATE is not set CONFIG_INTEL_XWAY_PHY=m CONFIG_INTERCONNECT_EXYNOS=y diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config index aabb3b302..4fe6acb82 100644 --- a/kernel-ppc64le-debug-fedora.config +++ b/kernel-ppc64le-debug-fedora.config @@ -2483,7 +2483,6 @@ CONFIG_INTEL_SOC_PMIC_CHTDC_TI=m # CONFIG_INTEL_TCC_COOLING is not set # CONFIG_INTEL_TH is not set CONFIG_INTEL_UNCORE_FREQ_CONTROL=m -# CONFIG_INTEL_VSEC is not set # CONFIG_INTEL_WMI_SBL_FW_UPDATE is not set CONFIG_INTEL_XWAY_PHY=m # CONFIG_INTERCONNECT_QCOM_MSM8996 is not set diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config index 0f2ecb671..9831f743c 100644 --- a/kernel-ppc64le-debug-rhel.config +++ b/kernel-ppc64le-debug-rhel.config @@ -2208,7 +2208,6 @@ CONFIG_INTEL_RST=m # CONFIG_INTEL_TH is not set CONFIG_INTEL_TURBO_MAX_3=y CONFIG_INTEL_UNCORE_FREQ_CONTROL=m -# CONFIG_INTEL_VSEC is not set # CONFIG_INTEL_WMI_SBL_FW_UPDATE is not set CONFIG_INTEL_WMI_THUNDERBOLT=m CONFIG_INTEL_XWAY_PHY=m diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config index 5f4a4f003..09fa7342b 100644 --- a/kernel-ppc64le-fedora.config +++ b/kernel-ppc64le-fedora.config @@ -2466,7 +2466,6 @@ CONFIG_INTEL_SOC_PMIC_CHTDC_TI=m # CONFIG_INTEL_TCC_COOLING is not set # CONFIG_INTEL_TH is not set CONFIG_INTEL_UNCORE_FREQ_CONTROL=m -# CONFIG_INTEL_VSEC is not set # CONFIG_INTEL_WMI_SBL_FW_UPDATE is not set CONFIG_INTEL_XWAY_PHY=m # CONFIG_INTERCONNECT_QCOM_MSM8996 is not set diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config index 4c74041ca..81a965846 100644 --- a/kernel-ppc64le-rhel.config +++ b/kernel-ppc64le-rhel.config @@ -2192,7 +2192,6 @@ CONFIG_INTEL_RST=m # CONFIG_INTEL_TH is not set CONFIG_INTEL_TURBO_MAX_3=y CONFIG_INTEL_UNCORE_FREQ_CONTROL=m -# CONFIG_INTEL_VSEC is not set # CONFIG_INTEL_WMI_SBL_FW_UPDATE is not set CONFIG_INTEL_WMI_THUNDERBOLT=m CONFIG_INTEL_XWAY_PHY=m diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config index 4b47b85c9..ad75573e2 100644 --- a/kernel-s390x-debug-fedora.config +++ b/kernel-s390x-debug-fedora.config @@ -2461,7 +2461,6 @@ CONFIG_INTEL_SOC_PMIC_CHTDC_TI=m # CONFIG_INTEL_TCC_COOLING is not set # CONFIG_INTEL_TH is not set CONFIG_INTEL_UNCORE_FREQ_CONTROL=m -# CONFIG_INTEL_VSEC is not set # CONFIG_INTEL_WMI_SBL_FW_UPDATE is not set CONFIG_INTEL_XWAY_PHY=m # CONFIG_INTERCONNECT_QCOM_MSM8996 is not set diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config index 62a6d4225..9a0319f7b 100644 --- a/kernel-s390x-debug-rhel.config +++ b/kernel-s390x-debug-rhel.config @@ -2192,7 +2192,6 @@ CONFIG_INTEL_RST=m # CONFIG_INTEL_TH is not set CONFIG_INTEL_TURBO_MAX_3=y CONFIG_INTEL_UNCORE_FREQ_CONTROL=m -# CONFIG_INTEL_VSEC is not set # CONFIG_INTEL_WMI_SBL_FW_UPDATE is not set CONFIG_INTEL_WMI_THUNDERBOLT=m CONFIG_INTEL_XWAY_PHY=m diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config index bf2f0103d..857df8d09 100644 --- a/kernel-s390x-fedora.config +++ b/kernel-s390x-fedora.config @@ -2444,7 +2444,6 @@ CONFIG_INTEL_SOC_PMIC_CHTDC_TI=m # CONFIG_INTEL_TCC_COOLING is not set # CONFIG_INTEL_TH is not set CONFIG_INTEL_UNCORE_FREQ_CONTROL=m -# CONFIG_INTEL_VSEC is not set # CONFIG_INTEL_WMI_SBL_FW_UPDATE is not set CONFIG_INTEL_XWAY_PHY=m # CONFIG_INTERCONNECT_QCOM_MSM8996 is not set diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config index d862a6e19..85f4f0987 100644 --- a/kernel-s390x-rhel.config +++ b/kernel-s390x-rhel.config @@ -2176,7 +2176,6 @@ CONFIG_INTEL_RST=m # CONFIG_INTEL_TH is not set CONFIG_INTEL_TURBO_MAX_3=y CONFIG_INTEL_UNCORE_FREQ_CONTROL=m -# CONFIG_INTEL_VSEC is not set # CONFIG_INTEL_WMI_SBL_FW_UPDATE is not set CONFIG_INTEL_WMI_THUNDERBOLT=m CONFIG_INTEL_XWAY_PHY=m diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config index 808e1faa9..a1b1d2edc 100644 --- a/kernel-s390x-zfcpdump-rhel.config +++ b/kernel-s390x-zfcpdump-rhel.config @@ -2188,7 +2188,6 @@ CONFIG_INTEL_RST=m # CONFIG_INTEL_TH is not set CONFIG_INTEL_TURBO_MAX_3=y CONFIG_INTEL_UNCORE_FREQ_CONTROL=m -# CONFIG_INTEL_VSEC is not set # CONFIG_INTEL_WMI_SBL_FW_UPDATE is not set CONFIG_INTEL_WMI_THUNDERBOLT=m CONFIG_INTEL_XWAY_PHY=m diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config index 115fae5a7..00172ec9b 100644 --- a/kernel-x86_64-debug-rhel.config +++ b/kernel-x86_64-debug-rhel.config @@ -2369,7 +2369,7 @@ CONFIG_INTEL_TURBO_MAX_3=y CONFIG_INTEL_TXT=y CONFIG_INTEL_UNCORE_FREQ_CONTROL=m CONFIG_INTEL_VBTN=m -# CONFIG_INTEL_VSEC is not set +CONFIG_INTEL_VSEC=m # CONFIG_INTEL_WMI_SBL_FW_UPDATE is not set CONFIG_INTEL_WMI_THUNDERBOLT=m CONFIG_INTEL_XWAY_PHY=m diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config index d48d447c7..3aeacb3d2 100644 --- a/kernel-x86_64-rhel.config +++ b/kernel-x86_64-rhel.config @@ -2353,7 +2353,7 @@ CONFIG_INTEL_TURBO_MAX_3=y CONFIG_INTEL_TXT=y CONFIG_INTEL_UNCORE_FREQ_CONTROL=m CONFIG_INTEL_VBTN=m -# CONFIG_INTEL_VSEC is not set +CONFIG_INTEL_VSEC=m # CONFIG_INTEL_WMI_SBL_FW_UPDATE is not set CONFIG_INTEL_WMI_THUNDERBOLT=m CONFIG_INTEL_XWAY_PHY=m diff --git a/kernel.spec b/kernel.spec index 098cdbd43..126b26b4e 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 1 +%define debugbuildsenabled 0 -%global distro_build 0.rc6.109 +%global distro_build 0.rc6.20220302gitfb184c4af9b9.111 %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.109 +%define pkgrelease 0.rc6.20220302gitfb184c4af9b9.111 # This is needed to do merge window version magic %define patchlevel 17 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc6.109%{?buildid}%{?dist} +%define specrelease 0.rc6.20220302gitfb184c4af9b9.111%{?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.tar.xz +Source0: linux-5.17-rc6-54-gfb184c4af9b9.tar.xz Source1: Makefile.rhelver @@ -1391,8 +1391,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.17-rc6 -c -mv linux-5.17-rc6 linux-%{KVERREL} +%setup -q -n kernel-5.17-rc6-54-gfb184c4af9b9 -c +mv linux-5.17-rc6-54-gfb184c4af9b9 linux-%{KVERREL} cd linux-%{KVERREL} cp -a %{SOURCE1} . @@ -3005,12 +3005,15 @@ fi # # %changelog -* Mon Feb 28 2022 Justin M. Forbes [5.17-0.rc6.109] -- Build CROS_EC Modules (Jason Montleon) - -* Mon Feb 28 2022 Fedora Kernel Team [5.17-0.rc6.109] +* Wed Mar 02 2022 Fedora Kernel Team [5.17-0.rc6.fb184c4af9b9.111] - mm/sparsemem: Fix 'mem_section' will never be NULL gcc 12 warning (Waiman Long) +* Wed Mar 02 2022 Fedora Kernel Team [5.17-0.rc6.fb184c4af9b9.110] +- redhat: Fix "make dist-release-finish" to use the correct NVR variables (Neal Gompa) [2053836] + +* Tue Mar 01 2022 Fedora Kernel Team [5.17-0.rc6.719fce7539cd.109] +- Build CROS_EC Modules (Jason Montleon) + * Mon Feb 28 2022 Fedora Kernel Team [5.17-0.rc6.108] - redhat: configs: change aarch64 default dma domain to lazy (Jerry Snitselaar) - redhat: configs: disable ATM protocols (Davide Caratti) diff --git a/sources b/sources index d22369205..598f8ff35 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-5.17-rc6.tar.xz) = 66d92d5671f9bdca333aa1f52bc91a54ed62a9ad845cca4cf906c52b0937e9445750bf67c2d25bcf4b858d89cde7e7827c98bd12727ac033a4d6d2bb208130cd -SHA512 (kernel-abi-stablelists-5.17.0-0.rc6.109.tar.bz2) = df15cbf6a0027346b9e34778e4c69a10401504295aa0e483c8e9b8f9b8d4737335be32b57eca30fd32cb6843ccb1e1bdc8de11a06ef619a37b22136d89501995 -SHA512 (kernel-kabi-dw-5.17.0-0.rc6.109.tar.bz2) = a3dc2fd59f5e0475c2169ae6db4ec5abe697d8feb95a49c96ce23885b254f2b980d679580b3d6d9f06bc7bf68e6779f3af8457ff2b0dbb84a71d795072e9460d +SHA512 (linux-5.17-rc6-54-gfb184c4af9b9.tar.xz) = b2af7b4a8c3b869f4158f7188b8c5ac77248f685151166d57458ef555f26591b7fd77b76b831e2d51a73543fd397eabb6482b240ef5b5c55c686f7df8b58e49d +SHA512 (kernel-abi-stablelists-5.17.0-0.rc6.20220302gitfb184c4af9b9.111.tar.bz2) = f79d8bf614a1773e17ee2b2bbdc04922efcef90bebd0aecad527e66d3441a6884e6684bb15f771258e8c0560ec8ae7428d3185d49f0ca7fe2c382b744b4c6747 +SHA512 (kernel-kabi-dw-5.17.0-0.rc6.20220302gitfb184c4af9b9.111.tar.bz2) = f934752da74ee65c1962cf04b3f6cdbb5a7aaacfc4fa2091d356abb5267e4c834bc94d3e6a15ed29151e2e2ec85f4b0d15bba9e123bef88982d7daef25f6d91c -- cgit