diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-09-11 06:26:23 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-09-11 06:26:23 +0200 |
| commit | ae00f5031ceab9a92fc5b2a8acf15093b601ed1f (patch) | |
| tree | ea61bb458da11ea23ea427eafc8242d6453f522a /kernel.spec | |
| parent | 5f6821e64b46390c2d8cf681e0ac8ed06f529915 (diff) | |
| parent | 843ad10b79a8949e19d62514ab679a147d84670e (diff) | |
| download | kernel-ae00f5031ceab9a92fc5b2a8acf15093b601ed1f.tar.gz kernel-ae00f5031ceab9a92fc5b2a8acf15093b601ed1f.tar.xz kernel-ae00f5031ceab9a92fc5b2a8acf15093b601ed1f.zip | |
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-5.15.0-0.rc0.20210910gitbf9f243f23e6.9.vanilla.1.fc36kernel-5.15.0-0.rc0.20210910gitbf9f243f23e6.9.vanilla.1.fc35kernel-5.15.0-0.rc0.20210910gitbf9f243f23e6.9.vanilla.1.fc34kernel-5.15.0-0.rc0.20210910gitbf9f243f23e6.9.vanilla.1.fc33
Diffstat (limited to 'kernel.spec')
| -rwxr-xr-x | kernel.spec | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/kernel.spec b/kernel.spec index 69c32fdc4..c18e7351d 100755 --- a/kernel.spec +++ b/kernel.spec @@ -80,7 +80,7 @@ Summary: The Linux kernel # the --with-release option overrides this setting.) %define debugbuildsenabled 1 -%global distro_build 0.rc0.20210909gita3fa7a101dcf.8 +%global distro_build 0.rc0.20210910gitbf9f243f23e6.9 %if 0%{?fedora} %define secure_boot_arch x86_64 @@ -127,13 +127,13 @@ Summary: The Linux kernel %define rpmversion 5.15.0 %define patchversion 5.15 -%define pkgrelease 0.rc0.20210909gita3fa7a101dcf.8 +%define pkgrelease 0.rc0.20210910gitbf9f243f23e6.9 # This is needed to do merge window version magic %define patchlevel 15 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc0.20210909gita3fa7a101dcf.8%{?buildid}%{?dist} +%define specrelease 0.rc0.20210910gitbf9f243f23e6.9%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -674,7 +674,7 @@ BuildRequires: lld # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-5.14-10557-ga3fa7a101dcf.tar.xz +Source0: linux-5.14-10807-gbf9f243f23e6.tar.xz Source1: Makefile.rhelver @@ -1360,8 +1360,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.14-10557-ga3fa7a101dcf -c -mv linux-5.14-10557-ga3fa7a101dcf linux-%{KVERREL} +%setup -q -n kernel-5.14-10807-gbf9f243f23e6 -c +mv linux-5.14-10807-gbf9f243f23e6 linux-%{KVERREL} cd linux-%{KVERREL} # cp -a %{SOURCE1} . @@ -2964,12 +2964,13 @@ fi # # %changelog -* Thu Sep 09 2021 Justin M. Forbes <jforbes@fedoraproject.org> [5.15-0.rc0.20210909gita3fa7a101dcf.8] -- Fixup IOMMU configs in pending so that configs are sane again (Justin M. Forbes) - -* Thu Sep 09 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.15-0.rc0.20210909gita3fa7a101dcf.8] +* Fri Sep 10 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.15-0.rc0.20210910gitbf9f243f23e6.9] - Temporarily stop building perf with LIBBPF_DYNAMIC=1 (Justin M. Forbes) +* Fri Sep 10 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.15-0.rc0.20210910gitbf9f243f23e6.8] +- Update CONFIG_WERROR to disabled as it can cause issue with out of tree modules. (Justin M. Forbes) +- Fixup IOMMU configs in pending so that configs are sane again (Justin M. Forbes) + * Wed Sep 08 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.15-0.rc0.20210908gitac08b1c68d1b.6] - Some initial Fedora config items for 5.15 (Justin M. Forbes) |