From c6771ba6c6d35472ba4efe83b5832de2fae45cc8 Mon Sep 17 00:00:00 2001 From: "Herton R. Krzesinski" Date: Tue, 26 Oct 2021 17:04:55 -0400 Subject: [PATCH] kernel-5.14.0-10.el9 * Tue Oct 26 2021 Herton R. Krzesinski [5.14.0-10.el9] - block: return ELEVATOR_DISCARD_MERGE if possible (Ming Lei) [1991958] - blk-mq: avoid to iterate over stale request (Ming Lei) [2009110] - redhat/configs: enable CONFIG_IMA_WRITE_POLICY (Bruno Meneguele) [2006320] - CI: Update deprecated configs (Veronika Kabatova) Resolves: rhbz#1991958, rhbz#2006320, rhbz#2009110 Signed-off-by: Herton R. Krzesinski --- Makefile.rhelver | 2 +- kernel-aarch64-debug-rhel.config | 2 +- kernel-aarch64-rhel.config | 2 +- kernel-ppc64le-debug-rhel.config | 2 +- kernel-ppc64le-rhel.config | 2 +- kernel-s390x-debug-rhel.config | 2 +- kernel-s390x-rhel.config | 2 +- kernel-s390x-zfcpdump-rhel.config | 2 +- kernel-x86_64-debug-rhel.config | 2 +- kernel-x86_64-rhel.config | 2 +- kernel.spec | 18 ++++++++++++------ sources | 6 +++--- 12 files changed, 25 insertions(+), 19 deletions(-) diff --git a/Makefile.rhelver b/Makefile.rhelver index 5ab023840..d0f476069 100644 --- a/Makefile.rhelver +++ b/Makefile.rhelver @@ -12,7 +12,7 @@ RHEL_MINOR = 0 # # Use this spot to avoid future merge conflicts. # Do not trim this comment. -RHEL_RELEASE = 9 +RHEL_RELEASE = 10 # # Early y+1 numbering diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config index 3aff05ae7..62b4c6e0b 100644 --- a/kernel-aarch64-debug-rhel.config +++ b/kernel-aarch64-debug-rhel.config @@ -2274,7 +2274,7 @@ CONFIG_IMA_READ_POLICY=y CONFIG_IMA_SIG_TEMPLATE=y # CONFIG_IMA_TEMPLATE is not set CONFIG_IMA_TRUSTED_KEYRING=y -# CONFIG_IMA_WRITE_POLICY is not set +CONFIG_IMA_WRITE_POLICY=y CONFIG_IMA=y # CONFIG_IMG_ASCII_LCD is not set # CONFIG_IMX_SC_WDT is not set diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config index 8dc98cea8..15f9cc554 100644 --- a/kernel-aarch64-rhel.config +++ b/kernel-aarch64-rhel.config @@ -2258,7 +2258,7 @@ CONFIG_IMA_READ_POLICY=y CONFIG_IMA_SIG_TEMPLATE=y # CONFIG_IMA_TEMPLATE is not set CONFIG_IMA_TRUSTED_KEYRING=y -# CONFIG_IMA_WRITE_POLICY is not set +CONFIG_IMA_WRITE_POLICY=y CONFIG_IMA=y # CONFIG_IMG_ASCII_LCD is not set # CONFIG_IMX_SC_WDT is not set diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config index 8f5a01f73..482ad8341 100644 --- a/kernel-ppc64le-debug-rhel.config +++ b/kernel-ppc64le-debug-rhel.config @@ -2098,7 +2098,7 @@ CONFIG_IMA_SECURE_AND_OR_TRUSTED_BOOT=y CONFIG_IMA_SIG_TEMPLATE=y # CONFIG_IMA_TEMPLATE is not set CONFIG_IMA_TRUSTED_KEYRING=y -# CONFIG_IMA_WRITE_POLICY is not set +CONFIG_IMA_WRITE_POLICY=y CONFIG_IMA=y # CONFIG_IMG_ASCII_LCD is not set # CONFIG_IMX_SC_WDT is not set diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config index f354d703e..16c2ed552 100644 --- a/kernel-ppc64le-rhel.config +++ b/kernel-ppc64le-rhel.config @@ -2082,7 +2082,7 @@ CONFIG_IMA_SECURE_AND_OR_TRUSTED_BOOT=y CONFIG_IMA_SIG_TEMPLATE=y # CONFIG_IMA_TEMPLATE is not set CONFIG_IMA_TRUSTED_KEYRING=y -# CONFIG_IMA_WRITE_POLICY is not set +CONFIG_IMA_WRITE_POLICY=y CONFIG_IMA=y # CONFIG_IMG_ASCII_LCD is not set # CONFIG_IMX_SC_WDT is not set diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config index bb4d5a119..4e416666c 100644 --- a/kernel-s390x-debug-rhel.config +++ b/kernel-s390x-debug-rhel.config @@ -2081,7 +2081,7 @@ CONFIG_IMA_READ_POLICY=y CONFIG_IMA_SIG_TEMPLATE=y # CONFIG_IMA_TEMPLATE is not set CONFIG_IMA_TRUSTED_KEYRING=y -# CONFIG_IMA_WRITE_POLICY is not set +CONFIG_IMA_WRITE_POLICY=y CONFIG_IMA=y # CONFIG_IMG_ASCII_LCD is not set # CONFIG_IMX_SC_WDT is not set diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config index 950ad563f..c692c2239 100644 --- a/kernel-s390x-rhel.config +++ b/kernel-s390x-rhel.config @@ -2065,7 +2065,7 @@ CONFIG_IMA_READ_POLICY=y CONFIG_IMA_SIG_TEMPLATE=y # CONFIG_IMA_TEMPLATE is not set CONFIG_IMA_TRUSTED_KEYRING=y -# CONFIG_IMA_WRITE_POLICY is not set +CONFIG_IMA_WRITE_POLICY=y CONFIG_IMA=y # CONFIG_IMG_ASCII_LCD is not set # CONFIG_IMX_SC_WDT is not set diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config index 2e5c40976..a21f16ed5 100644 --- a/kernel-s390x-zfcpdump-rhel.config +++ b/kernel-s390x-zfcpdump-rhel.config @@ -2079,7 +2079,7 @@ CONFIG_IMA_READ_POLICY=y CONFIG_IMA_SIG_TEMPLATE=y # CONFIG_IMA_TEMPLATE is not set CONFIG_IMA_TRUSTED_KEYRING=y -# CONFIG_IMA_WRITE_POLICY is not set +CONFIG_IMA_WRITE_POLICY=y CONFIG_IMA=y # CONFIG_IMG_ASCII_LCD is not set # CONFIG_IMX_SC_WDT is not set diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config index ecb42e3a1..f381d43ff 100644 --- a/kernel-x86_64-debug-rhel.config +++ b/kernel-x86_64-debug-rhel.config @@ -2245,7 +2245,7 @@ CONFIG_IMA_SECURE_AND_OR_TRUSTED_BOOT=y CONFIG_IMA_SIG_TEMPLATE=y # CONFIG_IMA_TEMPLATE is not set CONFIG_IMA_TRUSTED_KEYRING=y -# CONFIG_IMA_WRITE_POLICY is not set +CONFIG_IMA_WRITE_POLICY=y CONFIG_IMA=y # CONFIG_IMG_ASCII_LCD is not set # CONFIG_IMX_SC_WDT is not set diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config index 35b82926a..07643aced 100644 --- a/kernel-x86_64-rhel.config +++ b/kernel-x86_64-rhel.config @@ -2229,7 +2229,7 @@ CONFIG_IMA_SECURE_AND_OR_TRUSTED_BOOT=y CONFIG_IMA_SIG_TEMPLATE=y # CONFIG_IMA_TEMPLATE is not set CONFIG_IMA_TRUSTED_KEYRING=y -# CONFIG_IMA_WRITE_POLICY is not set +CONFIG_IMA_WRITE_POLICY=y CONFIG_IMA=y # CONFIG_IMG_ASCII_LCD is not set # CONFIG_IMX_SC_WDT is not set diff --git a/kernel.spec b/kernel.spec index 147bc374c..53d401aa9 100755 --- a/kernel.spec +++ b/kernel.spec @@ -85,7 +85,7 @@ Summary: The Linux kernel # the --with-release option overrides this setting.) %define debugbuildsenabled 1 -%global distro_build 9 +%global distro_build 10 %if 0%{?fedora} %define secure_boot_arch x86_64 @@ -129,13 +129,13 @@ Summary: The Linux kernel %define kversion 5.14 %define rpmversion 5.14.0 -%define pkgrelease 9.el9 +%define pkgrelease 10.el9 # This is needed to do merge window version magic %define patchlevel 14 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 9%{?buildid}%{?dist} +%define specrelease 10%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -676,7 +676,7 @@ BuildRequires: lld # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-5.14.0-9.el9.tar.xz +Source0: linux-5.14.0-10.el9.tar.xz Source1: Makefile.rhelver @@ -1360,8 +1360,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.14.0-9.el9 -c -mv linux-5.14.0-9.el9 linux-%{KVERREL} +%setup -q -n kernel-5.14.0-10.el9 -c +mv linux-5.14.0-10.el9 linux-%{KVERREL} cd linux-%{KVERREL} cp -a %{SOURCE1} . @@ -2952,6 +2952,12 @@ fi # # %changelog +* Tue Oct 26 2021 Herton R. Krzesinski [5.14.0-10.el9] +- block: return ELEVATOR_DISCARD_MERGE if possible (Ming Lei) [1991958] +- blk-mq: avoid to iterate over stale request (Ming Lei) [2009110] +- redhat/configs: enable CONFIG_IMA_WRITE_POLICY (Bruno Meneguele) [2006320] +- CI: Update deprecated configs (Veronika Kabatova) + * Wed Oct 20 2021 Herton R. Krzesinski [5.14.0-9.el9] - powerpc/pseries: Prevent free CPU ids being reused on another node (Desnes A. Nunes do Rosario) [2004809] - pseries/drmem: update LMBs after LPM (Desnes A. Nunes do Rosario) [2004809] diff --git a/sources b/sources index 004b8eaa7..b891a2e84 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-5.14.0-9.el9.tar.xz) = 8d9924dc8ba7f9f3763e419f26708bf62612b906cc9b43189d9a9aa9b0db326b2a27ca18e55be40dfc776635b2372a4fc246f0f85f1be47f1ca66c7c4a074c44 -SHA512 (kernel-abi-stablelists-5.14.0-9.tar.bz2) = b34350f610ca4e11146584fdd6da02e9839aa5e727fd33f2df256106f76192776e6477bad9cccc1faea378b9b228946cc5b2d8b0852bb3a28a5d3436f6488b8e -SHA512 (kernel-kabi-dw-5.14.0-9.tar.bz2) = fed340883088f3f7e279b35c15696fba47b4f84db4adccd5c9ac326e1674c1fbf1afae2d767e31707762f44b5dea8924dac0e62e249252d0087665cc423dcf60 +SHA512 (linux-5.14.0-10.el9.tar.xz) = 087220b28842df661d4ddcb4c774e811b53dccbdfba65bbc2187183f0f62a3f176ccf0021443ac3ec125c4bbfc65ee92b567edfa30ab18e50fa0298225887366 +SHA512 (kernel-abi-stablelists-5.14.0-10.tar.bz2) = 773663136e85ae65033038606211b3760d69edf1461c299da0f523f05ea3ed0362d13d7400bfb2639ed3b044dd173498f784665e3d16b5eb65c6ad260f996ed6 +SHA512 (kernel-kabi-dw-5.14.0-10.tar.bz2) = abd1b8d40ed8909b75dfd314efb95e2c586cb5200913a3c1ddc10d500410496772005d3b55047a8249e30305a52469c83fbd0add21db7ad141c1f3bf982d0a8a