diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-03-22 14:18:40 +0100 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-03-22 14:18:40 +0100 |
commit | bf7fd5939b66c0c3f27a824508606083206d0b1d (patch) | |
tree | c208e9445452161e29c4da24fde7bfc1f360fb0b /kernel.spec | |
parent | 9fe4d215c8360cde2876c5bf52f80920f8b4d68b (diff) | |
parent | 0a067cf60a983acddf8ac442b1dd211e4f4eefe4 (diff) | |
download | kernel-bf7fd5939b66c0c3f27a824508606083206d0b1d.tar.gz kernel-bf7fd5939b66c0c3f27a824508606083206d0b1d.tar.xz kernel-bf7fd5939b66c0c3f27a824508606083206d0b1d.zip |
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-5.12.0-0.rc4.175.vanilla.1.fc35kernel-5.12.0-0.rc4.175.vanilla.1.fc34kernel-5.12.0-0.rc4.175.vanilla.1.fc33kernel-5.12.0-0.rc4.175.vanilla.1.fc32
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 14500a8a3..4a66b13fa 100755 --- a/kernel.spec +++ b/kernel.spec @@ -64,7 +64,7 @@ Summary: The Linux kernel # For a stable, released kernel, released_kernel should be 1. %global released_kernel 0 -%global distro_build 0.rc3.20210319git8b12a62a4e3e.172 +%global distro_build 0.rc4.175 %if 0%{?fedora} %define secure_boot_arch x86_64 @@ -107,13 +107,13 @@ Summary: The Linux kernel %endif %define rpmversion 5.12.0 -%define pkgrelease 0.rc3.20210319git8b12a62a4e3e.172 +%define pkgrelease 0.rc4.175 # This is needed to do merge window version magic %define patchlevel 12 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc3.20210319git8b12a62a4e3e.172%{?buildid}%{?dist} +%define specrelease 0.rc4.175%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -604,7 +604,7 @@ BuildRequires: asciidoc # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-20210319git8b12a62a4e3e.tar.xz +Source0: linux-5.12-rc4.tar.xz Source1: Makefile.rhelver @@ -1253,8 +1253,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-20210319git8b12a62a4e3e -c -mv linux-20210319git8b12a62a4e3e linux-%{KVERREL} +%setup -q -n kernel-5.12-rc4 -c +mv linux-5.12-rc4 linux-%{KVERREL} cd linux-%{KVERREL} # cp -a %{SOURCE1} . @@ -2768,6 +2768,9 @@ fi # # %changelog +* Sat Mar 20 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.12.0-0.rc3.20210320git1c273e10bc0c.173] +- CONFIG_VFIO now selects IOMMU_API instead of depending on it, causing several config mismatches for the zfcpdump kernel (Justin M. Forbes) + * Thu Mar 18 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.12.0-0.rc3.20210318git6417f03132a6.171] - Turn off weak-modules for Fedora (Justin M. Forbes) - redhat: enable CONFIG_FW_LOADER_COMPRESS for ARK (Herton R. Krzesinski) [1939095] |