diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-02-12 14:07:58 +0100 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-02-12 14:07:58 +0100 |
| commit | 02202dc293aaef939f676323e0d6a11a7e76f1a8 (patch) | |
| tree | 8e0327ab2ef909fb3ec3d47df6b56b5d1da6781b /kernel.spec | |
| parent | 3286b458da8406e95c140211c1e234027d78824b (diff) | |
| parent | 0b7b6f660388a2c14355a891c336dd7cb56c0989 (diff) | |
| download | kernel-02202dc293aaef939f676323e0d6a11a7e76f1a8.tar.gz kernel-02202dc293aaef939f676323e0d6a11a7e76f1a8.tar.xz kernel-02202dc293aaef939f676323e0d6a11a7e76f1a8.zip | |
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-5.11.0-0.rc7.20210212git291009f656e8.151.vanilla.1.fc34kernel-5.11.0-0.rc7.20210212git291009f656e8.151.vanilla.1.fc33kernel-5.11.0-0.rc7.20210212git291009f656e8.151.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 985f329c1..e82a2793f 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.20210210gite0756cfc7d7c.150 +%global distro_build 0.rc7.20210212git291009f656e8.151 %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.20210210gite0756cfc7d7c.150 +%define pkgrelease 0.rc7.20210212git291009f656e8.151 # This is needed to do merge window version magic %define patchlevel 11 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc7.20210210gite0756cfc7d7c.150%{?buildid}%{?dist} +%define specrelease 0.rc7.20210212git291009f656e8.151%{?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-20210210gite0756cfc7d7c.tar.xz +Source0: linux-20210212git291009f656e8.tar.xz Source1: Makefile.rhelver @@ -1253,8 +1253,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-20210210gite0756cfc7d7c -c -mv linux-20210210gite0756cfc7d7c linux-%{KVERREL} +%setup -q -n kernel-20210212git291009f656e8 -c +mv linux-20210212git291009f656e8 linux-%{KVERREL} cd linux-%{KVERREL} # cp -a %{SOURCE1} . @@ -2756,9 +2756,12 @@ fi # # %changelog -* Wed Feb 10 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.11.0-0.rc7.20210210gite0756cfc7d7c.150] +* Fri Feb 12 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.11.0-0.rc7.20210212git291009f656e8.151] - Bluetooth: L2CAP: Try harder to accept device not knowing options (Bastien Nocera) +* 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) + * Wed Feb 10 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.11.0-0.rc7.20210210gite0756cfc7d7c.149] - Fix trailing white space in redhat/configs/fedora/generic/CONFIG_SND_INTEL_BYT_PREFER_SOF (Justin M. Forbes) - Add a redhat/rebase-notes.txt file (Hans de Goede) |