diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-04-04 16:43:26 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-04-04 16:43:26 +0200 |
commit | 2be08941cfbd35c49339ed10a5dd1e4af0037139 (patch) | |
tree | 98ee336e7e9ca6a4c3dda87fadefdc2b70973a66 /kernel.spec | |
parent | 29e246910e6d0901ca530e87e3db96185e397c8e (diff) | |
parent | d86cbb69b2901c173dfc4ed24e9fe5da818de435 (diff) | |
download | kernel-2be08941cfbd35c49339ed10a5dd1e4af0037139.tar.gz kernel-2be08941cfbd35c49339ed10a5dd1e4af0037139.tar.xz kernel-2be08941cfbd35c49339ed10a5dd1e4af0037139.zip |
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-5.18.0-0.rc1.18.vanilla.1.fc37kernel-5.18.0-0.rc1.18.vanilla.1.fc36kernel-5.18.0-0.rc1.18.vanilla.1.fc35kernel-5.18.0-0.rc1.18.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 f925e58b7..6861e7882 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.20220401gite8b767f5e04097a.15 +%global distro_build 0.rc1.18 %if 0%{?fedora} %define secure_boot_arch x86_64 @@ -134,13 +134,13 @@ Summary: The Linux kernel %define rpmversion 5.18.0 %define patchversion 5.18 -%define pkgrelease 0.rc0.20220401gite8b767f5e04097a.15 +%define pkgrelease 0.rc1.18 # This is needed to do merge window version magic %define patchlevel 18 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc0.20220401gite8b767f5e04097a.15%{?buildid}%{?dist} +%define specrelease 0.rc1.18%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -700,7 +700,7 @@ BuildRequires: lld # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-5.17-13673-ge8b767f5e04097a.tar.xz +Source0: linux-5.18-rc1.tar.xz Source1: Makefile.rhelver @@ -1392,8 +1392,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.17-13673-ge8b767f5e04097a -c -mv linux-5.17-13673-ge8b767f5e04097a linux-%{KVERREL} +%setup -q -n kernel-5.18-rc1 -c +mv linux-5.18-rc1 linux-%{KVERREL} cd linux-%{KVERREL} # cp -a %{SOURCE1} . @@ -3024,9 +3024,12 @@ fi # # %changelog -* Fri Apr 01 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.18.0-0.rc0.e8b767f5e04097a.14] +* Mon Apr 04 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.18.0-0.rc1.17] - redhat/kernel.spec.template: Fix intel-speed-select compile (Prarit Bhargava) + +* Mon Apr 04 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.18.0-0.rc1.16] - mm/sparsemem: Fix 'mem_section' will never be NULL gcc 12 warning (Waiman Long) +- redhat/configs: Enable CONFIG_RCU_SCALE_TEST & CONFIG_RCU_REF_SCALE_TEST (Waiman Long) * Fri Apr 01 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.18.0-0.rc0.e8b767f5e04097a.13] - Add clk_test and clk-gate_test to mod-internal.list (Justin M. Forbes) |