diff --git a/Makefile.rhelver b/Makefile.rhelver index 1baec73..d3e5b2d 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 = 11 +RHEL_RELEASE = 12 # # Early y+1 numbering @@ -44,4 +44,4 @@ ifneq ("$(ZSTREAM)", "yes") endif endif -RTBUILD:=.11 +RTBUILD:=.12 diff --git a/kernel.spec b/kernel.spec index df858e5..c72e0c8 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 11 +%global distro_build 12 %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 11.rt21.11.el9 +%define pkgrelease 12.rt21.12.el9 # This is needed to do merge window version magic %define patchlevel 14 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 11.rt21.11%{?buildid}%{?dist} +%define specrelease 12.rt21.12%{?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-11.rt21.11.el9.tar.xz +Source0: linux-5.14.0-12.rt21.12.el9.tar.xz Source1: Makefile.rhelver @@ -1431,8 +1431,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.14.0-11.rt21.11.el9 -c -mv linux-5.14.0-11.rt21.11.el9 linux-%{KVERREL} +%setup -q -n kernel-5.14.0-12.rt21.12.el9 -c +mv linux-5.14.0-12.rt21.12.el9 linux-%{KVERREL} cd linux-%{KVERREL} cp -a %{SOURCE1} . @@ -3081,6 +3081,16 @@ fi # # %changelog +* Fri Nov 05 2021 Juri Lelli [5.14.0-12.rt21.12.el9] +- redhat: make dist-srpm-gcov add to BUILDOPTS (Jan Stancek) [2017628] +- redhat: Fix dist-srpm-gcov (Jan Stancek) [2017628] +- s390: report more CPU capabilities (Robin Dapp) [2012095] +- s390/disassembler: add instructions (Robin Dapp) [2012095] +- audit: move put_tree() to avoid trim_trees refcount underflow and UAF (Richard Guy Briggs) [1985904] +- libbpf: Properly ignore STT_SECTION symbols in legacy map definitions (Jiri Olsa) [1998266] +- libbpf: Ignore STT_SECTION symbols in 'maps' section (Jiri Olsa) [1998266] +- selftests, bpf: test_lwt_ip_encap: Really disable rp_filter (Jiri Benc) [2006328] + * Fri Oct 29 2021 Juri Lelli [5.14.0-11.rt21.11.el9] - selinux: remove the SELinux lockdown implementation (Ondrej Mosnacek) [1940843 1945581] - bpf: Fix integer overflow in prealloc_elems_and_freelist() (Yauheni Kaliuta) [2010494] {CVE-2021-41864} diff --git a/sources b/sources index 30fadf3..0dca061 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-11.rt21.11.el9.tar.xz) = a74e40f91b87b0dc649a09e8911ab14a99e4c1b5f9a7bc86884d4b7d06a4562dd771514cfbb46579b6740ee48c8da172b1e84401c995a4cae714efe8984c38d4 -SHA512 (kernel-abi-stablelists-5.14.0-11.tar.bz2) = 0640ce3020f8b41dbfba9be642582a79faa3e8b99554058905baac4bca4adf18f007915b6b682d81bbba417fcb99c02f7c65e06b9ee5acf97d60232e783130c1 -SHA512 (kernel-kabi-dw-5.14.0-11.tar.bz2) = c901529aff636abbc2aa5f289ec098a2a29c8507aa81ee649d1104592b8abad9f495db0e947dc36a84e043708a47373de35156b40b252281ef747f06e19ed914 +SHA512 (linux-5.14.0-12.rt21.12.el9.tar.xz) = ccd2d83cf7d2a8882675726a2f4d719dddea608e43d4f2225f5bba5800c7a7a6bcce2e23dd0bff2da96de9ca646cf5978534742117c113b1af4c311e30d29e7d +SHA512 (kernel-abi-stablelists-5.14.0-12.tar.bz2) = 22e4c6503ae1654055c66d60b62a40126eecf79d0ae7dccd8e7902d566ade0d55c0130388c0a339f448ec72f00f26e9134e1b6df9567bda758c7ea6b2d68870c +SHA512 (kernel-kabi-dw-5.14.0-12.tar.bz2) = c901529aff636abbc2aa5f289ec098a2a29c8507aa81ee649d1104592b8abad9f495db0e947dc36a84e043708a47373de35156b40b252281ef747f06e19ed914