diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-10-15 22:30:55 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-10-15 22:30:55 +0200 |
commit | b9009d4d2130dc503c74f39e66698702edc6c29a (patch) | |
tree | b03d6db99972f461ae60aac65c635bc712d7b827 /kernel.spec | |
parent | 02ffb3d2f6404ca15ae7676096ccbe09b9a6a2fe (diff) | |
parent | 54b49e52186e25fb43c0c1536cb85547a119bd89 (diff) | |
download | kernel-b9009d4d2130dc503c74f39e66698702edc6c29a.tar.gz kernel-b9009d4d2130dc503c74f39e66698702edc6c29a.tar.xz kernel-b9009d4d2130dc503c74f39e66698702edc6c29a.zip |
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-5.15.0-0.rc5.20211015gitec681c53f8d2.44.vanilla.1.fc36kernel-5.15.0-0.rc5.20211015gitec681c53f8d2.44.vanilla.1.fc35kernel-5.15.0-0.rc5.20211015gitec681c53f8d2.44.vanilla.1.fc34kernel-5.15.0-0.rc5.20211015gitec681c53f8d2.44.vanilla.1.fc33
Diffstat (limited to 'kernel.spec')
-rwxr-xr-x | kernel.spec | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/kernel.spec b/kernel.spec index 5220002d7..8a6552e20 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 0.rc5.20211013gitf4d0cc426f77.42 +%global distro_build 0.rc5.20211015gitec681c53f8d2.44 %if 0%{?fedora} %define secure_boot_arch x86_64 @@ -132,13 +132,13 @@ Summary: The Linux kernel %define rpmversion 5.15.0 %define patchversion 5.15 -%define pkgrelease 0.rc5.20211013gitf4d0cc426f77.42 +%define pkgrelease 0.rc5.20211015gitec681c53f8d2.44 # This is needed to do merge window version magic %define patchlevel 15 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc5.20211013gitf4d0cc426f77.42%{?buildid}%{?dist} +%define specrelease 0.rc5.20211015gitec681c53f8d2.44%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -681,7 +681,7 @@ BuildRequires: lld # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-5.15-rc5-39-gf4d0cc426f77.tar.xz +Source0: linux-5.15-rc5-126-gec681c53f8d2.tar.xz Source1: Makefile.rhelver @@ -1372,8 +1372,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.15-rc5-39-gf4d0cc426f77 -c -mv linux-5.15-rc5-39-gf4d0cc426f77 linux-%{KVERREL} +%setup -q -n kernel-5.15-rc5-126-gec681c53f8d2 -c +mv linux-5.15-rc5-126-gec681c53f8d2 linux-%{KVERREL} cd linux-%{KVERREL} # cp -a %{SOURCE1} . @@ -2976,10 +2976,14 @@ fi # # %changelog -* Wed Oct 13 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.15-0.rc5.20211013gitf4d0cc426f77.42] -- Add kfence_test to mod-internal.list (Justin M. Forbes) +* Fri Oct 15 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.15-0.rc5.20211015gitec681c53f8d2.44] - Temporarily turn off selftests for bpf on ppc (Justin M. Forbes) +* Fri Oct 15 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.15-0.rc5.20211015gitec681c53f8d2.43] +- Fix dist-srpm-gcov (Don Zickus) +- redhat: configs: add CONFIG_NTB and related items (John W. Linville) +- Add kfence_test to mod-internal.list (Justin M. Forbes) + * Tue Oct 12 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.15-0.rc5.20211012gitfa5878760579.40] - Enable KUNIT tests for redhat kernel-modules-internal (Nico Pache) - redhat: add *-matched meta packages to rpminspect emptyrpm config (Herton R. Krzesinski) |