diff --git a/Makefile.rhelver b/Makefile.rhelver index bbe7a8e..579f407 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 = 20 +RHEL_RELEASE = 21 # # Early y+1 numbering @@ -44,4 +44,4 @@ ifneq ("$(ZSTREAM)", "yes") endif endif -RTBUILD:=.20 +RTBUILD:=.21 diff --git a/kernel-rt-x86_64-debug-rhel.config b/kernel-rt-x86_64-debug-rhel.config index 53a175b..4e54334 100644 --- a/kernel-rt-x86_64-debug-rhel.config +++ b/kernel-rt-x86_64-debug-rhel.config @@ -2818,6 +2818,7 @@ CONFIG_KERNEL_HEADER_TEST=y # CONFIG_KERNEL_ZSTD is not set CONFIG_KEXEC_BZIMAGE_VERIFY_SIG=y CONFIG_KEXEC_FILE=y +CONFIG_KEXEC_IMAGE_VERIFY_SIG=y CONFIG_KEXEC_JUMP=y # CONFIG_KEXEC_SIG_FORCE is not set CONFIG_KEXEC_SIG=y diff --git a/kernel-rt-x86_64-rhel.config b/kernel-rt-x86_64-rhel.config index 0e4124c..e6a1884 100644 --- a/kernel-rt-x86_64-rhel.config +++ b/kernel-rt-x86_64-rhel.config @@ -2799,6 +2799,7 @@ CONFIG_KERNEL_HEADER_TEST=y # CONFIG_KERNEL_ZSTD is not set CONFIG_KEXEC_BZIMAGE_VERIFY_SIG=y CONFIG_KEXEC_FILE=y +CONFIG_KEXEC_IMAGE_VERIFY_SIG=y CONFIG_KEXEC_JUMP=y # CONFIG_KEXEC_SIG_FORCE is not set CONFIG_KEXEC_SIG=y diff --git a/kernel.spec b/kernel.spec index c12e400..902eec9 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 20 +%global distro_build 21 %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 20.rt21.20.el9 +%define pkgrelease 21.rt21.21.el9 # This is needed to do merge window version magic %define patchlevel 14 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 20.rt21.20%{?buildid}%{?dist} +%define specrelease 21.rt21.21%{?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-20.rt21.20.el9.tar.xz +Source0: linux-5.14.0-21.rt21.21.el9.tar.xz Source1: Makefile.rhelver @@ -1432,8 +1432,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.14.0-20.rt21.20.el9 -c -mv linux-5.14.0-20.rt21.20.el9 linux-%{KVERREL} +%setup -q -n kernel-5.14.0-21.rt21.21.el9 -c +mv linux-5.14.0-21.rt21.21.el9 linux-%{KVERREL} cd linux-%{KVERREL} cp -a %{SOURCE1} . @@ -2346,7 +2346,7 @@ for dir in bpf bpf/no_alu32 bpf/progs; do test -d $dir || continue mkdir -p %{buildroot}%{_libexecdir}/kselftests/$dir find $dir -maxdepth 1 -type f \( -executable -o -name '*.py' -o -name settings -o \ - -name 'btf_dump_test_case_*.c' -o \ + -name 'btf_dump_test_case_*.c' -o -name '*.ko' -o \ -name '*.o' -exec sh -c 'readelf -h "{}" | grep -q "^ Machine:.*BPF"' \; \) -print0 | \ xargs -0 cp -t %{buildroot}%{_libexecdir}/kselftests/$dir || true done @@ -3080,6 +3080,34 @@ fi # # %changelog +* Fri Nov 26 2021 Juri Lelli [5.14.0-21.rt21.21.el9] +- clocksource: Increase WATCHDOG_MAX_SKEW (Waiman Long) [2017164] +- x86/hpet: Use another crystalball to evaluate HPET usability (Waiman Long) [2017164] +- scsi: target: Fix the pgr/alua_support_store functions (Maurizio Lombardi) [2023439] +- redhat: fix typo and make the output more silent for dist-git sync (Herton R. Krzesinski) +- x86: ACPI: cstate: Optimize C3 entry on AMD CPUs (David Arcari) [1998526] +- scsi: lpfc: Update lpfc version to 14.0.0.3 (Dick Kennedy) [2021327] +- scsi: lpfc: Allow fabric node recovery if recovery is in progress before devloss (Dick Kennedy) [2021327] +- scsi: lpfc: Fix link down processing to address NULL pointer dereference (Dick Kennedy) [2021327] +- scsi: lpfc: Allow PLOGI retry if previous PLOGI was aborted (Dick Kennedy) [2021327] +- scsi: lpfc: Fix use-after-free in lpfc_unreg_rpi() routine (Dick Kennedy) [2021327] +- scsi: lpfc: Correct sysfs reporting of loop support after SFP status change (Dick Kennedy) [2021327] +- scsi: lpfc: Wait for successful restart of SLI3 adapter during host sg_reset (Dick Kennedy) [2021327] +- scsi: lpfc: Revert LOG_TRACE_EVENT back to LOG_INIT prior to driver_resource_setup() (Dick Kennedy) [2021327] +- x86/Kconfig: Do not enable AMD_MEM_ENCRYPT_ACTIVE_BY_DEFAULT automatically (Prarit Bhargava) [2021200] +- ucounts: Move get_ucounts from cred_alloc_blank to key_change_session_keyring (Alexey Gladkov) [2018142] +- ucounts: Proper error handling in set_cred_ucounts (Alexey Gladkov) [2018142] +- ucounts: Pair inc_rlimit_ucounts with dec_rlimit_ucoutns in commit_creds (Alexey Gladkov) [2018142] +- ucounts: Fix signal ucount refcounting (Alexey Gladkov) [2018142] +- x86/cpu: Fix migration safety with X86_BUG_NULL_SEL (Vitaly Kuznetsov) [2016959] +- ip6_gre: Revert "ip6_gre: add validation for csum_start" (Guillaume Nault) [2014993] +- ip_gre: validate csum_start only on pull (Guillaume Nault) [2014993] +- redhat/configs: enable KEXEC_IMAGE_VERIFY_SIG for RHEL (Coiby Xu) [1994858] +- redhat/configs: enable KEXEC_SIG for aarch64 RHEL (Coiby Xu) [1994858] +- kernel.spec: add bpf_testmod.ko to kselftests/bpf (Viktor Malik) [2006318 2006319] +- netfilter: Add deprecation notices for xtables (Phil Sutter) [1945179] +- redhat: Add mark_driver_deprecated() (Phil Sutter) [1945179] + * Wed Nov 24 2021 Juri Lelli [5.14.0-20.rt21.20.el9] - powerpc/svm: Don't issue ultracalls if !mem_encrypt_active() (Herton R. Krzesinski) [2025186] diff --git a/sources b/sources index ee3299a..a87c050 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-20.rt21.20.el9.tar.xz) = fd190d444c2d90f4faf2155143f547eb37fd35d83d080076787e9b8a4c66cdc83db202bd55cf78681b632f27b4e7f0bc5c9e0a4aa1a41dbcede68284fa246aa8 -SHA512 (kernel-abi-stablelists-5.14.0-20.tar.bz2) = 905321c8beee33206169056c30ec8baae8a5bc0c5c4e9762e5a4729c845a4315f8de4d804b27589451975abef245b64eacd57a4ed7cb96f9754e7049f87d2ef7 -SHA512 (kernel-kabi-dw-5.14.0-20.tar.bz2) = c901529aff636abbc2aa5f289ec098a2a29c8507aa81ee649d1104592b8abad9f495db0e947dc36a84e043708a47373de35156b40b252281ef747f06e19ed914 +SHA512 (linux-5.14.0-21.rt21.21.el9.tar.xz) = e05214949aced08054a5502ca5801f0e5befd8b89ffc98f377079f92a7f4527d3cf6f5396cc547bd948053de63dcc4886bc5f90c673471f668f4dd9cd535371c +SHA512 (kernel-abi-stablelists-5.14.0-21.tar.bz2) = 716155bc891f9e691ec1e5b3193aeca6946d8d1d87574f7ee4bec96611f8d120cea0bbe4ad44582a496a13266326ee03fbdae676546bee54d52ce22d75faea09 +SHA512 (kernel-kabi-dw-5.14.0-21.tar.bz2) = c901529aff636abbc2aa5f289ec098a2a29c8507aa81ee649d1104592b8abad9f495db0e947dc36a84e043708a47373de35156b40b252281ef747f06e19ed914