diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-02-23 16:39:23 +0100 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-02-23 16:39:23 +0100 |
commit | ba4da878448507f877ad73612cbc43be102c2b55 (patch) | |
tree | 0602d1e4c1e03550ab2121b0b37fa5ab9817a05f /kernel.spec | |
parent | f39bbe54feebf65d17e9cfde0fff0be9e31932ac (diff) | |
parent | 1d814e580d73048c3ec93b177e4a93593bcdc6b8 (diff) | |
download | kernel-ba4da878448507f877ad73612cbc43be102c2b55.tar.gz kernel-ba4da878448507f877ad73612cbc43be102c2b55.tar.xz kernel-ba4da878448507f877ad73612cbc43be102c2b55.zip |
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-5.17.0-0.rc5.20220223git5c1ee569660d.104.vanilla.1.fc37kernel-5.17.0-0.rc5.20220223git5c1ee569660d.104.vanilla.1.fc36kernel-5.17.0-0.rc5.20220223git5c1ee569660d.104.vanilla.1.fc35kernel-5.17.0-0.rc5.20220223git5c1ee569660d.104.vanilla.1.fc34
Diffstat (limited to 'kernel.spec')
-rwxr-xr-x | kernel.spec | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/kernel.spec b/kernel.spec index fed926530..16189e625 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.rc5.20220222git038101e6b2cd.103 +%global distro_build 0.rc5.20220223git5c1ee569660d.104 %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.rc5.20220222git038101e6b2cd.103 +%define pkgrelease 0.rc5.20220223git5c1ee569660d.104 # This is needed to do merge window version magic %define patchlevel 17 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc5.20220222git038101e6b2cd.103%{?buildid}%{?dist} +%define specrelease 0.rc5.20220223git5c1ee569660d.104%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -697,7 +697,7 @@ BuildRequires: lld # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-5.17-rc5-4-g038101e6b2cd.tar.xz +Source0: linux-5.17-rc5-11-g5c1ee569660d.tar.xz Source1: Makefile.rhelver @@ -1393,8 +1393,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.17-rc5-4-g038101e6b2cd -c -mv linux-5.17-rc5-4-g038101e6b2cd linux-%{KVERREL} +%setup -q -n kernel-5.17-rc5-11-g5c1ee569660d -c +mv linux-5.17-rc5-11-g5c1ee569660d linux-%{KVERREL} cd linux-%{KVERREL} # cp -a %{SOURCE1} . @@ -3011,9 +3011,13 @@ fi # # %changelog -* Tue Feb 22 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.17-0.rc5.038101e6b2cd.103] +* Wed Feb 23 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.17-0.rc5.5c1ee569660d.104] - mm/sparsemem: Fix 'mem_section' will never be NULL gcc 12 warning (Waiman Long) +* Wed Feb 23 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.17-0.rc5.5c1ee569660d.103] +- redhat: configs: Disable CONFIG_MPLS for s390x/zfcpdump (Guillaume Nault) +- Fedora 5.17 configs round 1 (Justin M. Forbes) + * Tue Feb 22 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.17-0.rc5.038101e6b2cd.102] - redhat: configs: disable the surface platform (David Arcari) |