diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-06-28 19:35:12 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-06-28 19:35:12 +0200 |
| commit | fe6e5e3ac7dd7c33a0dd2731b2527e2e3e12abcf (patch) | |
| tree | 2aa92186619c228fc4c72d340995345c30f049b3 /kernel.spec | |
| parent | 0148cbfface7a5c3e5ff0006a03b702fa433e68c (diff) | |
| parent | fce0db79bbb3560b62367fe7746bdf22943a9165 (diff) | |
| download | kernel-fe6e5e3ac7dd7c33a0dd2731b2527e2e3e12abcf.tar.gz kernel-fe6e5e3ac7dd7c33a0dd2731b2527e2e3e12abcf.tar.xz kernel-fe6e5e3ac7dd7c33a0dd2731b2527e2e3e12abcf.zip | |
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedora
Diffstat (limited to 'kernel.spec')
| -rwxr-xr-x | kernel.spec | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/kernel.spec b/kernel.spec index 45677d0ae..6ebe06af4 100755 --- a/kernel.spec +++ b/kernel.spec @@ -73,7 +73,7 @@ Summary: The Linux kernel # the --with-release option overrides this setting.) %define debugbuildsenabled 1 -%global distro_build 0.rc7.20210625git44db63d1ad8d.55 +%global distro_build 58 %if 0%{?fedora} %define secure_boot_arch x86_64 @@ -119,13 +119,13 @@ Summary: The Linux kernel %define kversion 5.13 %define rpmversion 5.13.0 -%define pkgrelease 0.rc7.20210625git44db63d1ad8d.55 +%define pkgrelease 58 # This is needed to do merge window version magic %define patchlevel 13 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc7.20210625git44db63d1ad8d.55%{?buildid}%{?dist} +%define specrelease 58%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -644,7 +644,7 @@ BuildRequires: clang # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-5.13-rc7-43-g44db63d1ad8d.tar.xz +Source0: linux-5.13.tar.xz Source1: Makefile.rhelver @@ -1313,8 +1313,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.13-rc7-43-g44db63d1ad8d -c -mv linux-5.13-rc7-43-g44db63d1ad8d linux-%{KVERREL} +%setup -q -n kernel-5.13 -c +mv linux-5.13 linux-%{KVERREL} cd linux-%{KVERREL} # cp -a %{SOURCE1} . @@ -2888,6 +2888,14 @@ fi # # %changelog +* Mon Jun 28 2021 Justin M. Forbes <jforbes@fedoraproject.org> [5.13.0-58] +- Revert "PCI: of: Relax the condition for warning about non-prefetchable memory aperture size" (Herton R. Krzesinski) +- Revert "PCI: of: Refactor the check for non-prefetchable 32-bit window" (Herton R. Krzesinski) +- Fedora 5.13 config updates (Justin M. Forbes) + +* Mon Jun 28 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.13.0-58] +- More Fedora config updates for 5.13 (Justin M. Forbes) + * Fri Jun 25 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.13.0-0.rc7.20210625git44db63d1ad8d.55] - redhat/configs: Enable needed drivers for BlueField SoC on aarch64 (Alaa Hleihel) [1858592 1858594 1858596] - redhat: Rename mod-blacklist.sh to mod-denylist.sh (Prarit Bhargava) |