diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-03-21 16:20:35 +0100 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-03-21 16:20:35 +0100 |
| commit | cd6ec645433a45694e2ab5244c15ec39745a7881 (patch) | |
| tree | de1fc8bba1f98add76b284ad389ae92a856a7de1 /kernel.spec | |
| parent | 5ebc36af11140661b24fe257cd9a216d3a96ba40 (diff) | |
| parent | e8c8d8a5e1cf20116def8045306d0953fb848ba6 (diff) | |
| download | kernel-cd6ec645433a45694e2ab5244c15ec39745a7881.tar.gz kernel-cd6ec645433a45694e2ab5244c15ec39745a7881.tar.xz kernel-cd6ec645433a45694e2ab5244c15ec39745a7881.zip | |
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-5.17.0-128.vanilla.1.fc37kernel-5.17.0-128.vanilla.1.fc36kernel-5.17.0-128.vanilla.1.fc35kernel-5.17.0-128.vanilla.1.fc34
Diffstat (limited to 'kernel.spec')
| -rwxr-xr-x | kernel.spec | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/kernel.spec b/kernel.spec index 7c8480a0a..50ce0c644 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.rc8.20220318git551acdc3c3d2.125 +%global distro_build 128 %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.rc8.20220318git551acdc3c3d2.125 +%define pkgrelease 128 # This is needed to do merge window version magic %define patchlevel 17 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc8.20220318git551acdc3c3d2.125%{?buildid}%{?dist} +%define specrelease 128%{?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-rc8-45-g551acdc3c3d2.tar.xz +Source0: linux-5.17.tar.xz Source1: Makefile.rhelver @@ -1393,8 +1393,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.17-rc8-45-g551acdc3c3d2 -c -mv linux-5.17-rc8-45-g551acdc3c3d2 linux-%{KVERREL} +%setup -q -n kernel-5.17 -c +mv linux-5.17 linux-%{KVERREL} cd linux-%{KVERREL} # cp -a %{SOURCE1} . @@ -3025,7 +3025,11 @@ fi # # %changelog -* Fri Mar 18 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.17-0.rc8.551acdc3c3d2.124] +* Mon Mar 21 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.17-127] +- mm/sparsemem: Fix 'mem_section' will never be NULL gcc 12 warning (Waiman Long) + +* Sat Mar 19 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.17-0.rc8.34e047aa16c0.124] +- Enable net reference count trackers in all debug kernels (Jiri Benc) - redhat/Makefile: Reorganize variables (Prarit Bhargava) - redhat/Makefile: Add some descriptions (Prarit Bhargava) - redhat/Makefile: Move SNAPSHOT check (Prarit Bhargava) @@ -3050,7 +3054,6 @@ fi - redhat/Makefile: Move HEAD to Makefile.variables. (Prarit Bhargava) - redhat: Combine Makefile and Makefile.common (Prarit Bhargava) - redhat/koji/Makefile: Decouple koji Makefile from Makefile.common (Prarit Bhargava) -- mm/sparsemem: Fix 'mem_section' will never be NULL gcc 12 warning (Waiman Long) * Fri Mar 18 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.17-0.rc8.551acdc3c3d2.124] - Set CONFIG_SND_SOC_SOF_MT8195 for Fedora and turn on VDPA_SIM_BLOCK (Justin M. Forbes) |