diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-01-21 06:27:11 +0100 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-01-21 06:27:11 +0100 |
| commit | b70fe985fae7ba514a346e00da43efa6c1bc43a1 (patch) | |
| tree | 11b05c0c36260bfe591228c9ec8add2afc0c0c9f /kernel.spec | |
| parent | 0f7ff8d866b3b34ad36aaf6b3a3112005266881c (diff) | |
| parent | 51ecd720406dc3254cf81d928856e637a8d75bf4 (diff) | |
| download | kernel-b70fe985fae7ba514a346e00da43efa6c1bc43a1.tar.gz kernel-b70fe985fae7ba514a346e00da43efa6c1bc43a1.tar.xz kernel-b70fe985fae7ba514a346e00da43efa6c1bc43a1.zip | |
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-5.17.0-0.rc0.20220120gitfa2e1ba3e9e3.71.vanilla.1.fc36kernel-5.17.0-0.rc0.20220120gitfa2e1ba3e9e3.71.vanilla.1.fc35kernel-5.17.0-0.rc0.20220120gitfa2e1ba3e9e3.71.vanilla.1.fc34
Diffstat (limited to 'kernel.spec')
| -rwxr-xr-x | kernel.spec | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/kernel.spec b/kernel.spec index 65cd1e7ff..0b2a51418 100755 --- a/kernel.spec +++ b/kernel.spec @@ -87,7 +87,7 @@ Summary: The Linux kernel # the --with-release option overrides this setting.) %define debugbuildsenabled 1 -%global distro_build 0.rc0.20220119git1d1df41c5a33.70 +%global distro_build 0.rc0.20220120gitfa2e1ba3e9e3.71 %if 0%{?fedora} %define secure_boot_arch x86_64 @@ -134,13 +134,13 @@ Summary: The Linux kernel %define rpmversion 5.17.0 %define patchversion 5.17 -%define pkgrelease 0.rc0.20220119git1d1df41c5a33.70 +%define pkgrelease 0.rc0.20220120gitfa2e1ba3e9e3.71 # This is needed to do merge window version magic %define patchlevel 17 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc0.20220119git1d1df41c5a33.70%{?buildid}%{?dist} +%define specrelease 0.rc0.20220120gitfa2e1ba3e9e3.71%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -694,7 +694,7 @@ BuildRequires: lld # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-5.16-11200-g1d1df41c5a33.tar.xz +Source0: linux-5.16-11358-gfa2e1ba3e9e3.tar.xz Source1: Makefile.rhelver @@ -1388,8 +1388,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.16-11200-g1d1df41c5a33 -c -mv linux-5.16-11200-g1d1df41c5a33 linux-%{KVERREL} +%setup -q -n kernel-5.16-11358-gfa2e1ba3e9e3 -c +mv linux-5.16-11358-gfa2e1ba3e9e3 linux-%{KVERREL} cd linux-%{KVERREL} # cp -a %{SOURCE1} . @@ -2992,6 +2992,9 @@ fi # # %changelog +* Thu Jan 20 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.17-0.rc0.20220120gitfa2e1ba3e9e3.71] +- Fixup merge in random.c (Justin M. Forbes) + * Wed Jan 19 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.17-0.rc0.20220118gitfe81ba137ebc.69] - lib/crypto: add prompts back to crypto libraries (Justin M. Forbes) - Add packaged but empty /lib/modules/<kver>/systemtap/ (Justin M. Forbes) |