diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-10-09 08:10:02 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-10-09 08:10:02 +0200 |
| commit | a586bd371cfa50223094f3527ef70f62c2299543 (patch) | |
| tree | e1880bf3e23da534fb338fa7ee5b7c9bfe9e6503 /kernel.spec | |
| parent | a339309f875b7240e2006d47992e0b50b643d86c (diff) | |
| parent | 2f1ff80800f904f14b6510dcb30ae15183f46999 (diff) | |
| download | kernel-a586bd371cfa50223094f3527ef70f62c2299543.tar.gz kernel-a586bd371cfa50223094f3527ef70f62c2299543.tar.xz kernel-a586bd371cfa50223094f3527ef70f62c2299543.zip | |
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-5.15.0-0.rc4.20211008git1da38549dd64.36.vanilla.1.fc36kernel-5.15.0-0.rc4.20211008git1da38549dd64.36.vanilla.1.fc35kernel-5.15.0-0.rc4.20211008git1da38549dd64.36.vanilla.1.fc34kernel-5.15.0-0.rc4.20211008git1da38549dd64.36.vanilla.1.fc33
Diffstat (limited to 'kernel.spec')
| -rwxr-xr-x | kernel.spec | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/kernel.spec b/kernel.spec index d97cbc2fc..f1b58bb90 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.rc4.20211006git60a9483534ed.34 +%global distro_build 0.rc4.20211008git1da38549dd64.36 %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.rc4.20211006git60a9483534ed.34 +%define pkgrelease 0.rc4.20211008git1da38549dd64.36 # This is needed to do merge window version magic %define patchlevel 15 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc4.20211006git60a9483534ed.34%{?buildid}%{?dist} +%define specrelease 0.rc4.20211008git1da38549dd64.36%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -679,7 +679,7 @@ BuildRequires: lld # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-5.15-rc4-15-g60a9483534ed.tar.xz +Source0: linux-5.15-rc4-193-g1da38549dd64.tar.xz Source1: Makefile.rhelver @@ -1370,8 +1370,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.15-rc4-15-g60a9483534ed -c -mv linux-5.15-rc4-15-g60a9483534ed linux-%{KVERREL} +%setup -q -n kernel-5.15-rc4-193-g1da38549dd64 -c +mv linux-5.15-rc4-193-g1da38549dd64 linux-%{KVERREL} cd linux-%{KVERREL} # cp -a %{SOURCE1} . @@ -2974,8 +2974,9 @@ fi # # %changelog -* Wed Oct 06 2021 Justin M. Forbes <jforbes@fedoraproject.org> [5.15-0.rc4.20211006git60a9483534ed.34] -- Testing upstream bpf selftests (Justin M. Forbes) +* Thu Oct 07 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.15-0.rc4.20211007git5af4055fa813.35] +- Fedora NTFS config updates (Justin M. Forbes) +- Fedora 5.15 configs part 1 (Justin M. Forbes) * Wed Oct 06 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.15-0.rc4.20211006git60a9483534ed.34] - Revert "Merge branch 'ppcbpfselftest' into 'os-build'" (Justin M. Forbes) |