diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-01-27 19:11:06 +0100 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-01-27 19:11:06 +0100 |
| commit | 81ab2c0bf4261b65fba1d8c916b902ef22146cc6 (patch) | |
| tree | e3f2e92958afb609a13b3da433d157b5b5c363bf /kernel.spec | |
| parent | 9ae896490720dd5cd709110f6391e0c85e06e5ff (diff) | |
| parent | b0adfd4b4f0981efd2bf936bb3be4e0e005607df (diff) | |
| download | kernel-81ab2c0bf4261b65fba1d8c916b902ef22146cc6.tar.gz kernel-81ab2c0bf4261b65fba1d8c916b902ef22146cc6.tar.xz kernel-81ab2c0bf4261b65fba1d8c916b902ef22146cc6.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.11.0-0.rc5.20210127git2ab38c17aac1.136.vanilla.1.fc34kernel-5.11.0-0.rc5.20210127git2ab38c17aac1.136.vanilla.1.fc33kernel-5.11.0-0.rc5.20210127git2ab38c17aac1.136.vanilla.1.fc32
Diffstat (limited to 'kernel.spec')
| -rwxr-xr-x | kernel.spec | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/kernel.spec b/kernel.spec index e789fcd5a..4e8f6a592 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.rc5.20210126git13391c60da33.135 +%global distro_build 0.rc5.20210127git2ab38c17aac1.136 %if 0%{?fedora} %define secure_boot_arch x86_64 @@ -107,13 +107,13 @@ Summary: The Linux kernel %endif %define rpmversion 5.11.0 -%define pkgrelease 0.rc5.20210126git13391c60da33.135 +%define pkgrelease 0.rc5.20210127git2ab38c17aac1.136 # This is needed to do merge window version magic %define patchlevel 11 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc5.20210126git13391c60da33.135%{?buildid}%{?dist} +%define specrelease 0.rc5.20210127git2ab38c17aac1.136%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -603,7 +603,7 @@ BuildRequires: asciidoc # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-20210126git13391c60da33.tar.xz +Source0: linux-20210127git2ab38c17aac1.tar.xz Source1: Makefile.rhelver @@ -1249,8 +1249,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-20210126git13391c60da33 -c -mv linux-20210126git13391c60da33 linux-%{KVERREL} +%setup -q -n kernel-20210127git2ab38c17aac1 -c +mv linux-20210127git2ab38c17aac1 linux-%{KVERREL} cd linux-%{KVERREL} # cp -a %{SOURCE1} . @@ -2729,11 +2729,14 @@ fi # # %changelog -* Tue Jan 26 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.11.0-0.rc5.20210126git13391c60da33.135] +* Wed Jan 27 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.11.0-0.rc5.20210127git2ab38c17aac1.136] - redhat: replace inline awk script with genlog.py call (Herton R. Krzesinski) - redhat: add genlog.py script (Herton R. Krzesinski) - Turn off vdso_install for ppc (Justin M. Forbes) +* Wed Jan 27 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.11.0-0.rc5.20210127git2ab38c17aac1.135] +- New configs in lib/Kconfig.debug (Jeremy Cline) + * Mon Jan 25 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.11.0-0.rc5.133] - Fedora 5.11 config updates part 4 ("Justin M. Forbes") - Fedora 5.11 config updates part 3 ("Justin M. Forbes") |