diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-02-16 06:19:19 +0100 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-02-16 06:19:19 +0100 |
| commit | 638cdcbb9903db2c7a6c23771fa80d12e241e95b (patch) | |
| tree | f9d3ca08925278fd0fb9b371ed0b6221557368f6 /kernel.spec | |
| parent | 02202dc293aaef939f676323e0d6a11a7e76f1a8 (diff) | |
| parent | d24ad453a6273ee9dec91d3d7caf072b8a2817e3 (diff) | |
| download | kernel-638cdcbb9903db2c7a6c23771fa80d12e241e95b.tar.gz kernel-638cdcbb9903db2c7a6c23771fa80d12e241e95b.tar.xz kernel-638cdcbb9903db2c7a6c23771fa80d12e241e95b.zip | |
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-5.11.0-155.vanilla.1.fc35kernel-5.11.0-155.vanilla.1.fc34kernel-5.11.0-155.vanilla.1.fc33kernel-5.11.0-155.vanilla.1.fc32
Diffstat (limited to 'kernel.spec')
| -rwxr-xr-x | kernel.spec | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/kernel.spec b/kernel.spec index e82a2793f..1600a2712 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.rc7.20210212git291009f656e8.151 +%global distro_build 155 %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.rc7.20210212git291009f656e8.151 +%define pkgrelease 155 # This is needed to do merge window version magic %define patchlevel 11 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc7.20210212git291009f656e8.151%{?buildid}%{?dist} +%define specrelease 155%{?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-20210212git291009f656e8.tar.xz +Source0: linux-5.11.tar.xz Source1: Makefile.rhelver @@ -1253,8 +1253,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-20210212git291009f656e8 -c -mv linux-20210212git291009f656e8 linux-%{KVERREL} +%setup -q -n kernel-5.11 -c +mv linux-5.11 linux-%{KVERREL} cd linux-%{KVERREL} # cp -a %{SOURCE1} . @@ -2756,9 +2756,15 @@ fi # # %changelog -* Fri Feb 12 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.11.0-0.rc7.20210212git291009f656e8.151] +* Mon Feb 15 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.11.0-155] - Bluetooth: L2CAP: Try harder to accept device not knowing options (Bastien Nocera) +* Mon Feb 15 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.11.0-154] +- process_configs.sh: fix find/xargs data flow (Ondrej Mosnacek) + +* Sat Feb 13 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.11.0-0.rc7.20210213gitdcc0b49040c7.151] +- Fedora config update (Justin M. Forbes) + * Fri Feb 12 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.11.0-0.rc7.20210212git291009f656e8.150] - fedora: minor arm sound config updates (Peter Robinson) |