diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-02-17 17:34:31 +0100 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-02-17 17:34:31 +0100 |
commit | d8e462e74992416089d4ed306d01686539735c34 (patch) | |
tree | ff3c45ac0007bced298ac4e90bf77d14b0b1e88c /kernel.spec | |
parent | 455e4c9e68874f8d1e5231b9055e8ecac47490c0 (diff) | |
parent | 4d39407806f2c1fca6a1645d15deac8b9e855bf6 (diff) | |
download | kernel-d8e462e74992416089d4ed306d01686539735c34.tar.gz kernel-d8e462e74992416089d4ed306d01686539735c34.tar.xz kernel-d8e462e74992416089d4ed306d01686539735c34.zip |
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-5.17.0-0.rc4.20220217gitf71077a4d84b.99.vanilla.1.fc37kernel-5.17.0-0.rc4.20220217gitf71077a4d84b.99.vanilla.1.fc36kernel-5.17.0-0.rc4.20220217gitf71077a4d84b.99.vanilla.1.fc35kernel-5.17.0-0.rc4.20220217gitf71077a4d84b.99.vanilla.1.fc34
Diffstat (limited to 'kernel.spec')
-rwxr-xr-x | kernel.spec | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/kernel.spec b/kernel.spec index cdce7fc22..ba492659c 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.rc4.20220215gitd567f5db412e.97 +%global distro_build 0.rc4.20220217gitf71077a4d84b.99 %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.rc4.20220215gitd567f5db412e.97 +%define pkgrelease 0.rc4.20220217gitf71077a4d84b.99 # This is needed to do merge window version magic %define patchlevel 17 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc4.20220215gitd567f5db412e.97%{?buildid}%{?dist} +%define specrelease 0.rc4.20220217gitf71077a4d84b.99%{?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-rc4-2-gd567f5db412e.tar.xz +Source0: linux-5.17-rc4-54-gf71077a4d84b.tar.xz Source1: Makefile.rhelver @@ -1396,8 +1396,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.17-rc4-2-gd567f5db412e -c -mv linux-5.17-rc4-2-gd567f5db412e linux-%{KVERREL} +%setup -q -n kernel-5.17-rc4-54-gf71077a4d84b -c +mv linux-5.17-rc4-54-gf71077a4d84b linux-%{KVERREL} cd linux-%{KVERREL} # cp -a %{SOURCE1} . @@ -3018,10 +3018,14 @@ fi # # %changelog -* Tue Feb 15 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.17-0.rc4.d567f5db412e.97] +* Thu Feb 17 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.17-0.rc4.f71077a4d84b.99] - mm/sparsemem: Fix 'mem_section' will never be NULL gcc 12 warning (Waiman Long) - tools: Fix use-after-free for realloc(..., 0) (Kees Cook) +* Thu Feb 17 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.17-0.rc4.f71077a4d84b.98] +- configs: enable LOGITECH_FF for RHEL/CentOS too (Benjamin Tissoires) +- redhat/configs: Disable CONFIG_SENSORS_NCT6683 in RHEL for arm/aarch64 (Dean Nelson) [2041186] + * Sun Feb 13 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.17-0.rc3.b81b1829e7e3.94] - redhat: fix make {distg-brew,distg-koji} (Andrea Claudi) |