diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-05-16 18:29:12 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-05-16 18:29:12 +0200 |
commit | deb9ee0fa5386974c5835d6a139aa5c386fb2018 (patch) | |
tree | a71465ec29da10d868b548fa62cbe4fe8ad6a870 /kernel.spec | |
parent | 437be5ae477df4db34ddac0503f5dc4d1bc51650 (diff) | |
parent | f770443a3c7d11acb1b7e800a6b2eccf0ac8b4ab (diff) | |
download | kernel-deb9ee0fa5386974c5835d6a139aa5c386fb2018.tar.gz kernel-deb9ee0fa5386974c5835d6a139aa5c386fb2018.tar.xz kernel-deb9ee0fa5386974c5835d6a139aa5c386fb2018.zip |
merge originkernel-5.18.0-0.rc7.54.vanilla.1.fc37kernel-5.18.0-0.rc7.54.vanilla.1.fc36kernel-5.18.0-0.rc7.54.vanilla.1.fc35kernel-5.18.0-0.rc7.54.vanilla.1.fc34
Diffstat (limited to 'kernel.spec')
-rwxr-xr-x | kernel.spec | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/kernel.spec b/kernel.spec index 3e48b3749..304197137 100755 --- a/kernel.spec +++ b/kernel.spec @@ -131,13 +131,13 @@ Summary: The Linux kernel %define specversion 5.18.0 %define patchversion 5.18 -%define pkgrelease 0.rc6.20220513gitf3f19f939c11925.51 +%define pkgrelease 0.rc7.54 # This is needed to do merge window version magic %define patchlevel 18 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc6.220513.f3f19f939c11925.51%{?buildid}%{?dist} +%define specrelease 0.rc7.54%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -696,7 +696,7 @@ BuildRequires: lld # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-5.18-rc6-85-gf3f19f939c11925.tar.xz +Source0: linux-5.18-rc7.tar.xz Source1: Makefile.rhelver @@ -1388,8 +1388,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.18-rc6-85-gf3f19f939c11925 -c -mv linux-5.18-rc6-85-gf3f19f939c11925 linux-%{KVERREL} +%setup -q -n kernel-5.18-rc7 -c +mv linux-5.18-rc7 linux-%{KVERREL} cd linux-%{KVERREL} # cp -a %{SOURCE1} . @@ -3035,12 +3035,15 @@ fi # # %changelog -* Fri May 13 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.18.0-0.rc6.f3f19f939c11925.50] +* Mon May 16 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.18.0-0.rc7.53] - Add CONFIG_EFI_DXE_MEM_ATTRIBUTES (Justin M. Forbes) - efi: x86: Set the NX-compatibility flag in the PE header (Peter Jones) - efi: libstub: ensure allocated memory to be executable (Baskov Evgeniy) - efi: libstub: declare DXE services table (Baskov Evgeniy) +* Mon May 16 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.18.0-0.rc7.52] +- redhat/configs: fix CONFIG_INTEL_ISHTP_ECLITE (David Arcari) + * Fri May 13 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.18.0-0.rc6.f3f19f939c11925.49] - redhat/configs: Fix rm warning on error (Prarit Bhargava) - Fix nightly merge CI (Don Zickus) |