diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-04-11 16:30:18 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-04-11 16:30:18 +0200 |
commit | 59eafecd9c6215ab045765709262614f55b6a74b (patch) | |
tree | 9fe9cda737833512a8c88342004e19e3680c6a74 /kernel.spec | |
parent | 7edc91fcfcc422cd5709b73c39928cf30a712eab (diff) | |
parent | 138d787153a1337422ff1f6dc0e98d6bd05cb402 (diff) | |
download | kernel-59eafecd9c6215ab045765709262614f55b6a74b.tar.gz kernel-59eafecd9c6215ab045765709262614f55b6a74b.tar.xz kernel-59eafecd9c6215ab045765709262614f55b6a74b.zip |
merge originkernel-5.18.0-0.rc2.23.vanilla.1.fc37kernel-5.18.0-0.rc2.23.vanilla.1.fc36kernel-5.18.0-0.rc2.23.vanilla.1.fc35kernel-5.18.0-0.rc2.23.vanilla.1.fc34
Diffstat (limited to 'kernel.spec')
-rwxr-xr-x | kernel.spec | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/kernel.spec b/kernel.spec index 9a414e604..7672c39b3 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.rc1.20220408git1831fed559732b1.20 +%global distro_build 0.rc2.23 %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.rc1.20220408git1831fed559732b1.20 +%define pkgrelease 0.rc2.23 # This is needed to do merge window version magic %define patchlevel 18 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc1.220408g1831fed559732b1.20%{?buildid}%{?dist} +%define specrelease 0.rc2.23%{?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.18-rc1-184-g1831fed559732b1.tar.xz +Source0: linux-5.18-rc2.tar.xz Source1: Makefile.rhelver @@ -1392,8 +1392,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.18-rc1-184-g1831fed559732b1 -c -mv linux-5.18-rc1-184-g1831fed559732b1 linux-%{KVERREL} +%setup -q -n kernel-5.18-rc2 -c +mv linux-5.18-rc2 linux-%{KVERREL} cd linux-%{KVERREL} # cp -a %{SOURCE1} . @@ -3031,9 +3031,16 @@ fi # # %changelog -* Fri Apr 08 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.18.0-0.rc1.1831fed559732b1.19] +* Mon Apr 11 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.18.0-0.rc2.22] - tools/power/x86/intel-speed-select: fix build failure when using -Wl,--as-needed (Herton R. Krzesinski) +* Mon Apr 11 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.18.0-0.rc2.21] +- redhat/configs: enable CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT (Joel Savitz) [2026319] + +* Sat Apr 09 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.18.0-0.rc1.f1b45d8ccb9839b.19] +- configs: enable CONFIG_RMI4_F3A (Benjamin Tissoires) +- redhat: configs: Disable TPM 1.2 specific drivers (Jerry Snitselaar) + * Fri Apr 08 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.18.0-0.rc1.1831fed559732b1.18] - redhat/configs: Enable cr50 I2C TPM interface (Akihiko Odaki) - spec: make HMAC file encode relative path (Jonathan Lebon) |