diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-01-08 18:36:23 +0100 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-01-08 18:36:23 +0100 |
commit | 7f706ebbb1f4d236e33b9ff83efd976a8dbd92fb (patch) | |
tree | 8def89b047a49bef87678e3c3ad57526ee611b8e /kernel.spec | |
parent | 37ec8dbf9e3a42098b0fa2e080f75ecfc1a11791 (diff) | |
parent | fb6d0adee750536de839d00c205ab3504c8fb00f (diff) | |
download | kernel-7f706ebbb1f4d236e33b9ff83efd976a8dbd92fb.tar.gz kernel-7f706ebbb1f4d236e33b9ff83efd976a8dbd92fb.tar.xz kernel-7f706ebbb1f4d236e33b9ff83efd976a8dbd92fb.zip |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.11.0-0.rc2.20210108gitf5e6c330254a.119.vanilla.1.fc34kernel-5.11.0-0.rc2.20210108gitf5e6c330254a.119.vanilla.1.fc33kernel-5.11.0-0.rc2.20210108gitf5e6c330254a.119.vanilla.1.fc32
Diffstat (limited to 'kernel.spec')
-rwxr-xr-x | kernel.spec | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/kernel.spec b/kernel.spec index 35201d944..4354f7bd3 100755 --- a/kernel.spec +++ b/kernel.spec @@ -56,7 +56,7 @@ Summary: The Linux kernel # For a stable, released kernel, released_kernel should be 1. %global released_kernel 0 -%global distro_build 0.rc2.20210106git36bbbd0e234d.117 +%global distro_build 0.rc2.20210108gitf5e6c330254a.119 %if 0%{?fedora} %define secure_boot_arch x86_64 @@ -99,13 +99,13 @@ Summary: The Linux kernel %endif %define rpmversion 5.11.0 -%define pkgrelease 0.rc2.20210106git36bbbd0e234d.117 +%define pkgrelease 0.rc2.20210108gitf5e6c330254a.119 # This is needed to do merge window version magic %define patchlevel 11 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc2.20210106git36bbbd0e234d.117%{?buildid}%{?dist} +%define specrelease 0.rc2.20210108gitf5e6c330254a.119%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -594,7 +594,7 @@ BuildRequires: asciidoc # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-20210106git36bbbd0e234d.tar.xz +Source0: linux-20210108gitf5e6c330254a.tar.xz Source1: Makefile.rhelver @@ -1242,8 +1242,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-20210106git36bbbd0e234d -c -mv linux-20210106git36bbbd0e234d linux-%{KVERREL} +%setup -q -n kernel-20210108gitf5e6c330254a -c +mv linux-20210108gitf5e6c330254a linux-%{KVERREL} cd linux-%{KVERREL} # cp -a %{SOURCE1} . @@ -2726,11 +2726,16 @@ fi # # %changelog -* Wed Jan 06 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.11.0-0.rc2.20210106git36bbbd0e234d.117] -- Add gcc-c++ to BuildRequires ("Justin M. Forbes") +* Fri Jan 08 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.11.0-0.rc2.20210108gitf5e6c330254a.119] - irq: export irq_check_status_bit (Levi Yun) - Turn off vdso_install for ppc ("Justin M. Forbes") +* Fri Jan 08 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.11.0-0.rc2.20210108gitf5e6c330254a.118] +- Fedora: arm updates for 5.11 and general cross Fedora cleanups (Peter Robinson) + +* Thu Jan 07 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.11.0-0.rc2.20210107git71c061d24438.117] +- Add gcc-c++ to BuildRequires ("Justin M. Forbes") + * Wed Jan 06 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.11.0-0.rc2.20210106git36bbbd0e234d.116] - Update CONFIG_KASAN_HW_TAGS ("Justin M. Forbes") - gcc-plugins: fix gcc 11 indigestion with plugins... (=?UTF-8?q?Valdis=20Kl=C4=93tnieks?=) |