diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-02-25 04:54:59 +0100 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-02-25 04:54:59 +0100 |
commit | e661d91eb909e777a9d28425ef50fcc5ef7fa5ed (patch) | |
tree | 412b73a6bea10533a3b8d1f24baab9c18bba7943 /kernel.spec | |
parent | ba4da878448507f877ad73612cbc43be102c2b55 (diff) | |
parent | c939bf8bacb59784430c4d99f9d41ce0f7a5588a (diff) | |
download | kernel-e661d91eb909e777a9d28425ef50fcc5ef7fa5ed.tar.gz kernel-e661d91eb909e777a9d28425ef50fcc5ef7fa5ed.tar.xz kernel-e661d91eb909e777a9d28425ef50fcc5ef7fa5ed.zip |
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-5.17.0-0.rc5.20220224git23d04328444a.105.vanilla.1.fc37kernel-5.17.0-0.rc5.20220224git23d04328444a.105.vanilla.1.fc36kernel-5.17.0-0.rc5.20220224git23d04328444a.105.vanilla.1.fc35kernel-5.17.0-0.rc5.20220224git23d04328444a.105.vanilla.1.fc34
Diffstat (limited to 'kernel.spec')
-rwxr-xr-x | kernel.spec | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/kernel.spec b/kernel.spec index 16189e625..0bcb36874 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.20220223git5c1ee569660d.104 +%global distro_build 0.rc5.20220224git23d04328444a.105 %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.20220223git5c1ee569660d.104 +%define pkgrelease 0.rc5.20220224git23d04328444a.105 # This is needed to do merge window version magic %define patchlevel 17 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc5.20220223git5c1ee569660d.104%{?buildid}%{?dist} +%define specrelease 0.rc5.20220224git23d04328444a.105%{?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-11-g5c1ee569660d.tar.xz +Source0: linux-5.17-rc5-21-g23d04328444a.tar.xz Source1: Makefile.rhelver @@ -1393,8 +1393,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.17-rc5-11-g5c1ee569660d -c -mv linux-5.17-rc5-11-g5c1ee569660d linux-%{KVERREL} +%setup -q -n kernel-5.17-rc5-21-g23d04328444a -c +mv linux-5.17-rc5-21-g23d04328444a linux-%{KVERREL} cd linux-%{KVERREL} # cp -a %{SOURCE1} . @@ -3011,9 +3011,12 @@ fi # # %changelog -* Wed Feb 23 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.17-0.rc5.5c1ee569660d.104] +* Thu Feb 24 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.17-0.rc5.23d04328444a.105] - mm/sparsemem: Fix 'mem_section' will never be NULL gcc 12 warning (Waiman Long) +* Thu Feb 24 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.17-0.rc5.23d04328444a.104] +- configs/process_configs.sh: Remove orig files (Prarit Bhargava) + * 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) |