diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-11-05 14:59:33 +0100 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-11-05 14:59:33 +0100 |
| commit | 0e5fb867fc71677860bba8480815d93677624d98 (patch) | |
| tree | bab238e8d7d095240ca6a92123302a047d447114 /kernel.spec | |
| parent | 4d7f44489f729c985140a2d9632c2d65b7e9e969 (diff) | |
| parent | 1e70b8fe4c9374aa9356caf6214402692db80e4e (diff) | |
| download | kernel-0e5fb867fc71677860bba8480815d93677624d98.tar.gz kernel-0e5fb867fc71677860bba8480815d93677624d98.tar.xz kernel-0e5fb867fc71677860bba8480815d93677624d98.zip | |
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedora
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 956b5c645..ea2cf457f 100755 --- a/kernel.spec +++ b/kernel.spec @@ -85,7 +85,7 @@ Summary: The Linux kernel # the --with-release option overrides this setting.) %define debugbuildsenabled 1 -%global distro_build 0.rc0.20211104git7ddb58cb0eca.3 +%global distro_build 0.rc0.20211105gitd4439a1189f9.4 %if 0%{?fedora} %define secure_boot_arch x86_64 @@ -132,13 +132,13 @@ Summary: The Linux kernel %define rpmversion 5.16.0 %define patchversion 5.16 -%define pkgrelease 0.rc0.20211104git7ddb58cb0eca.3 +%define pkgrelease 0.rc0.20211105gitd4439a1189f9.4 # This is needed to do merge window version magic %define patchlevel 16 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc0.20211104git7ddb58cb0eca.3%{?buildid}%{?dist} +%define specrelease 0.rc0.20211105gitd4439a1189f9.4%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -684,7 +684,7 @@ BuildRequires: lld # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-5.15-8713-g7ddb58cb0eca.tar.xz +Source0: linux-5.15-10158-gd4439a1189f9.tar.xz Source1: Makefile.rhelver @@ -1376,8 +1376,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.15-8713-g7ddb58cb0eca -c -mv linux-5.15-8713-g7ddb58cb0eca linux-%{KVERREL} +%setup -q -n kernel-5.15-10158-gd4439a1189f9 -c +mv linux-5.15-10158-gd4439a1189f9 linux-%{KVERREL} cd linux-%{KVERREL} # cp -a %{SOURCE1} . @@ -2978,6 +2978,9 @@ fi # # %changelog +* Fri Nov 05 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.16-0.rc0.20211105gitd4439a1189f9.4] +- Fix up fedora config options from mismatch (Justin M. Forbes) + * Thu Nov 04 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.16-0.rc0.20211104git7ddb58cb0eca.3] - Add nct6775 to filter-modules.sh.rhel (Justin M. Forbes) - Enable PREEMPT_DYNAMIC for all but s390x (Justin M. Forbes) |