diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-03-03 19:34:05 +0100 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-03-03 19:34:05 +0100 |
commit | 0a80c5035a6e3fe0738e2453ae778965937f9d98 (patch) | |
tree | c4dd05011a3a58380a4da0d3871ccbf7495eff12 /kernel.spec | |
parent | b8fab2faf763801762a9755efd03a2b2e3124e0b (diff) | |
parent | e06dc60dd077479b5bdc49033b48f713253557a9 (diff) | |
download | kernel-0a80c5035a6e3fe0738e2453ae778965937f9d98.tar.gz kernel-0a80c5035a6e3fe0738e2453ae778965937f9d98.tar.xz kernel-0a80c5035a6e3fe0738e2453ae778965937f9d98.zip |
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-5.17.0-0.rc6.20220303git5859a2b19911.112.vanilla.1.fc37kernel-5.17.0-0.rc6.20220303git5859a2b19911.112.vanilla.1.fc36kernel-5.17.0-0.rc6.20220303git5859a2b19911.112.vanilla.1.fc35kernel-5.17.0-0.rc6.20220303git5859a2b19911.112.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 e1ebea3ab..e5afa61e0 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.rc6.20220302gitfb184c4af9b9.111 +%global distro_build 0.rc6.20220303git5859a2b19911.112 %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.rc6.20220302gitfb184c4af9b9.111 +%define pkgrelease 0.rc6.20220303git5859a2b19911.112 # This is needed to do merge window version magic %define patchlevel 17 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc6.20220302gitfb184c4af9b9.111%{?buildid}%{?dist} +%define specrelease 0.rc6.20220303git5859a2b19911.112%{?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-rc6-54-gfb184c4af9b9.tar.xz +Source0: linux-5.17-rc6-66-g5859a2b19911.tar.xz Source1: Makefile.rhelver @@ -1393,8 +1393,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.17-rc6-54-gfb184c4af9b9 -c -mv linux-5.17-rc6-54-gfb184c4af9b9 linux-%{KVERREL} +%setup -q -n kernel-5.17-rc6-66-g5859a2b19911 -c +mv linux-5.17-rc6-66-g5859a2b19911 linux-%{KVERREL} cd linux-%{KVERREL} # cp -a %{SOURCE1} . @@ -3011,9 +3011,12 @@ fi # # %changelog -* Wed Mar 02 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.17-0.rc6.fb184c4af9b9.111] +* Thu Mar 03 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.17-0.rc6.5859a2b19911.112] - mm/sparsemem: Fix 'mem_section' will never be NULL gcc 12 warning (Waiman Long) +* Thu Mar 03 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.17-0.rc6.5859a2b19911.111] +- redhat/configs: Disable CONFIG_MACINTOSH_DRIVERS in RHEL. (Prarit Bhargava) + * Wed Mar 02 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.17-0.rc6.fb184c4af9b9.110] - redhat: Fix "make dist-release-finish" to use the correct NVR variables (Neal Gompa) [2053836] |