diff --git a/Makefile.rhelver b/Makefile.rhelver index a620a22..6c78cbb 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 = 13 +RHEL_RELEASE = 14 # # Early y+1 numbering @@ -44,4 +44,4 @@ ifneq ("$(ZSTREAM)", "yes") endif endif -RTBUILD:=.13 +RTBUILD:=.14 diff --git a/kernel.spec b/kernel.spec index 9a477e8..98864ff 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 13 +%global distro_build 14 %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 13.rt21.13.el9 +%define pkgrelease 14.rt21.14.el9 # This is needed to do merge window version magic %define patchlevel 14 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 13.rt21.13%{?buildid}%{?dist} +%define specrelease 14.rt21.14%{?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-13.rt21.13.el9.tar.xz +Source0: linux-5.14.0-14.rt21.14.el9.tar.xz Source1: Makefile.rhelver @@ -817,6 +817,7 @@ Source72: filter-s390x.sh.fedora Source73: filter-modules.sh.fedora %endif +Source75: partial-kgcov-snip.config Source80: generate_all_configs.sh Source81: process_configs.sh @@ -1431,8 +1432,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.14.0-13.rt21.13.el9 -c -mv linux-5.14.0-13.rt21.13.el9 linux-%{KVERREL} +%setup -q -n kernel-5.14.0-14.rt21.14.el9 -c +mv linux-5.14.0-14.rt21.14.el9 linux-%{KVERREL} cd linux-%{KVERREL} cp -a %{SOURCE1} . @@ -1504,15 +1505,13 @@ for i in %{all_arch_configs} do mv $i $i.tmp ./merge.pl %{SOURCE3001} $i.tmp > $i - rm $i.tmp -done -%endif - -# enable GCOV kernel config options if gcov is on %if %{with_gcov} -for i in *.config -do - sed -i 's/# CONFIG_GCOV_KERNEL is not set/CONFIG_GCOV_KERNEL=y\nCONFIG_GCOV_PROFILE_ALL=y\n/' $i + echo "Merging with gcov options" + cat %{SOURCE75} + mv $i $i.tmp + ./merge.pl %{SOURCE75} $i.tmp > $i +%endif + rm $i.tmp done %endif @@ -2980,7 +2979,7 @@ fi %endif %if %{with_gcov} -%ifarch x86_64 s390x ppc64le aarch64 +%ifnarch %nobuildarches noarch %files gcov %{_builddir} %endif @@ -3081,6 +3080,21 @@ fi # # %changelog +* Thu Nov 11 2021 Juri Lelli [5.14.0-14.rt21.14.el9] +- evm: mark evm_fixmode as __ro_after_init (Bruno Meneguele) [2017160] +- IMA: remove -Wmissing-prototypes warning (Bruno Meneguele) [2017160] +- perf flamegraph: flamegraph.py script improvements (Michael Petlan) [2010271] +- redhat/configs/evaluate_configs: insert EMPTY tags at correct place (Jan Stancek) [2015082] +- redhat/configs/evaluate_configs: walk cfgvariants line by line (Jan Stancek) [2015082] +- redhat/configs: create a separate config for gcov options (Jan Stancek) [2015082] +- redhat/kernel.spec.template: don't hardcode gcov arches (Jan Stancek) [2015082] +- i40e: fix endless loop under rtnl (Stefan Assmann) [1992939] +- selftests/bpf: Use nanosleep tracepoint in perf buffer test (Jiri Olsa) [2006310] +- selftests/bpf: Fix possible/online index mismatch in perf_buffer test (Jiri Olsa) [2006310] +- selftests/bpf: Fix perf_buffer test on system with offline cpus (Jiri Olsa) [2006310] +- KVM: x86: Fix stack-out-of-bounds memory access from ioapic_write_indirect() (Vitaly Kuznetsov) [1965145] +- selftest/bpf: Switch recursion test to use htab_map_delete_elem (Jiri Olsa) [2006313] + * Tue Nov 09 2021 Juri Lelli [5.14.0-13.rt21.13.el9] - futex: Remove unused variable 'vpid' in futex_proxy_trylock_atomic() (Waiman Long) [2007032] - futex: Prevent inconsistent state and exit race (Waiman Long) [2007032] diff --git a/partial-kgcov-snip.config b/partial-kgcov-snip.config new file mode 100644 index 0000000..fb37359 --- /dev/null +++ b/partial-kgcov-snip.config @@ -0,0 +1,4 @@ +# kgcov +CONFIG_GCOV_KERNEL=y +CONFIG_GCOV_PROFILE_ALL=y +# CONFIG_GCOV_PROFILE_FTRACE is not set diff --git a/sources b/sources index 2f29939..decb7e8 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-13.rt21.13.el9.tar.xz) = 4668ed7c3075a899970bdf8b1c0a4c6de78ba58bfbdbf6c283d71a2f83e9e9de3c45939254b16b814c8eecc27f074c655989b1e7d852cd4a3dd23127a933fd4e -SHA512 (kernel-abi-stablelists-5.14.0-13.tar.bz2) = 61d701ffe9f271c4797ee25d2ae6ed1b64b9f665ae366d45da10e1ceeba9ec9b6d98b6f0bb910986af3147b2c247de9cb3d82e8d340c155903110362ead62ee1 -SHA512 (kernel-kabi-dw-5.14.0-13.tar.bz2) = c901529aff636abbc2aa5f289ec098a2a29c8507aa81ee649d1104592b8abad9f495db0e947dc36a84e043708a47373de35156b40b252281ef747f06e19ed914 +SHA512 (linux-5.14.0-14.rt21.14.el9.tar.xz) = 1c6507aa4e5efc0e9d9b503f874752f6b9d8e456e178f04f069bdeadd68d443fcf7af290899e273e6ec0e8fecd979d6593730e421d464266d36ba805d5eae68e +SHA512 (kernel-abi-stablelists-5.14.0-14.tar.bz2) = d98c861a574f40ba70b9a60420de021a65fb288173fc9378d43e4e3723bbbad73608ef46a34a98b26bb7f5cc9a124e77065880105def4b302f5c62b8f3e304c0 +SHA512 (kernel-kabi-dw-5.14.0-14.tar.bz2) = c901529aff636abbc2aa5f289ec098a2a29c8507aa81ee649d1104592b8abad9f495db0e947dc36a84e043708a47373de35156b40b252281ef747f06e19ed914