From dcee5fb5abb72402787912ce98fffca7568b4102 Mon Sep 17 00:00:00 2001 From: Juri Lelli Date: Wed, 27 Oct 2021 03:25:53 -0400 Subject: [PATCH] kernel-rt-5.14.0-10.rt21.10.el9 * Wed Oct 27 2021 Juri Lelli [5.14.0-10.rt21.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#2002474 --- Makefile.rhelver | 4 ++-- kernel-rt-x86_64-debug-rhel.config | 2 +- kernel-rt-x86_64-rhel.config | 2 +- kernel.spec | 18 ++++++++++++------ sources | 6 +++--- 5 files changed, 19 insertions(+), 13 deletions(-) diff --git a/Makefile.rhelver b/Makefile.rhelver index 46fc52a..052fbcb 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 @@ -44,4 +44,4 @@ ifneq ("$(ZSTREAM)", "yes") endif endif -RTBUILD:=.9 +RTBUILD:=.10 diff --git a/kernel-rt-x86_64-debug-rhel.config b/kernel-rt-x86_64-debug-rhel.config index 88f3604..889ef90 100644 --- a/kernel-rt-x86_64-debug-rhel.config +++ b/kernel-rt-x86_64-debug-rhel.config @@ -2336,7 +2336,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-rt-x86_64-rhel.config b/kernel-rt-x86_64-rhel.config index 134a941..7e8f9d2 100644 --- a/kernel-rt-x86_64-rhel.config +++ b/kernel-rt-x86_64-rhel.config @@ -2320,7 +2320,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 532f35b..f8b8bfb 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.rt21.9.el9 +%define pkgrelease 10.rt21.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.rt21.9%{?buildid}%{?dist} +%define specrelease 10.rt21.10%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -704,7 +704,7 @@ BuildRequires: lld # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-5.14.0-9.rt21.9.el9.tar.xz +Source0: linux-5.14.0-10.rt21.10.el9.tar.xz Source1: Makefile.rhelver @@ -1431,8 +1431,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.14.0-9.rt21.9.el9 -c -mv linux-5.14.0-9.rt21.9.el9 linux-%{KVERREL} +%setup -q -n kernel-5.14.0-10.rt21.10.el9 -c +mv linux-5.14.0-10.rt21.10.el9 linux-%{KVERREL} cd linux-%{KVERREL} cp -a %{SOURCE1} . @@ -3081,6 +3081,12 @@ fi # # %changelog +* Wed Oct 27 2021 Juri Lelli [5.14.0-10.rt21.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) + * Mon Oct 25 2021 Juri Lelli [5.14.0-9.rt21.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 a41f61c..87313ec 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ SHA512 (kernel-abi-whitelists-5.13.0-1.tar.bz2) = ceba454e1f590c1e4ef4115a75463ae3ac2c2aa7ec85fa14a2669d666c421483a38225ee19d7d72b4ac7032375741408b23543e43588538c80161ec0cf57051c -SHA512 (linux-5.14.0-9.rt21.9.el9.tar.xz) = 1305652c59098ca0c4228c8ee8db82343fa036fcc02e30d2e5a08d4d1c4bfecfe956aa4a908dacaffeb0a14ddaf2c6fb5f5f1c9f8206d275f1249eee0b9bcb0a -SHA512 (kernel-abi-stablelists-5.14.0-9.tar.bz2) = 6b191ca5da91af24006b1c7211f74e5f30fa8628a994c854ffcd0e2df2e9acfb0c4235ae5fc80b69494a04b1a89dd99807eeaea0db883c128a28b00b77e034ee -SHA512 (kernel-kabi-dw-5.14.0-9.tar.bz2) = c901529aff636abbc2aa5f289ec098a2a29c8507aa81ee649d1104592b8abad9f495db0e947dc36a84e043708a47373de35156b40b252281ef747f06e19ed914 +SHA512 (linux-5.14.0-10.rt21.10.el9.tar.xz) = c47e9249a412a6aa756d446ef18ca2aaa14fc02b3d03380a0bdbedd1061d663c7b2d7c64e278627f888ecad2ab795b574b2fa23b776f862ee4f282f1fe639ef5 +SHA512 (kernel-abi-stablelists-5.14.0-10.tar.bz2) = 6735e48f96213343faa0cbb68108872a4e157a2bc13b2e91c59b92f3f344f7f83579a93c680c21856ec7b0c12af1b2431819e5ddaa1402960c643545baf5b5c7 +SHA512 (kernel-kabi-dw-5.14.0-10.tar.bz2) = c901529aff636abbc2aa5f289ec098a2a29c8507aa81ee649d1104592b8abad9f495db0e947dc36a84e043708a47373de35156b40b252281ef747f06e19ed914