diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-01-17 18:35:50 +0100 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-01-17 18:35:50 +0100 |
commit | dfbb9c9bef416e32e1372608dbe0a00b96c332a4 (patch) | |
tree | c1279ea55aeba34b160009e1a86ef66d6931da39 /kernel.spec | |
parent | 2a06bd9ee06622de1f65b1313546ae3d9bafdf56 (diff) | |
parent | 2e962df60069d1785ed5aa55b9bcaeda5a6e0dca (diff) | |
download | kernel-dfbb9c9bef416e32e1372608dbe0a00b96c332a4.tar.gz kernel-dfbb9c9bef416e32e1372608dbe0a00b96c332a4.tar.xz kernel-dfbb9c9bef416e32e1372608dbe0a00b96c332a4.zip |
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-5.17.0-0.rc0.20220117git0c947b893d69.68.vanilla.1.fc36kernel-5.17.0-0.rc0.20220117git0c947b893d69.68.vanilla.1.fc35kernel-5.17.0-0.rc0.20220117git0c947b893d69.68.vanilla.1.fc34
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 c18cfa06c..932b89c1d 100755 --- a/kernel.spec +++ b/kernel.spec @@ -87,7 +87,7 @@ Summary: The Linux kernel # the --with-release option overrides this setting.) %define debugbuildsenabled 1 -%global distro_build 0.rc0.20220114gitfb3b0673b7d5.65 +%global distro_build 0.rc0.20220117git0c947b893d69.68 %if 0%{?fedora} %define secure_boot_arch x86_64 @@ -134,13 +134,13 @@ Summary: The Linux kernel %define rpmversion 5.17.0 %define patchversion 5.17 -%define pkgrelease 0.rc0.20220114gitfb3b0673b7d5.65 +%define pkgrelease 0.rc0.20220117git0c947b893d69.68 # This is needed to do merge window version magic %define patchlevel 17 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc0.20220114gitfb3b0673b7d5.65%{?buildid}%{?dist} +%define specrelease 0.rc0.20220117git0c947b893d69.68%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -694,7 +694,7 @@ BuildRequires: lld # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-5.16-8301-gfb3b0673b7d5.tar.xz +Source0: linux-5.16-10660-g0c947b893d69.tar.xz Source1: Makefile.rhelver @@ -1388,8 +1388,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.16-8301-gfb3b0673b7d5 -c -mv linux-5.16-8301-gfb3b0673b7d5 linux-%{KVERREL} +%setup -q -n kernel-5.16-10660-g0c947b893d69 -c +mv linux-5.16-10660-g0c947b893d69 linux-%{KVERREL} cd linux-%{KVERREL} # cp -a %{SOURCE1} . @@ -2990,7 +2990,10 @@ fi # # %changelog -* Fri Jan 14 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.17-0.rc0.20220114gitfb3b0673b7d5.65] +* Mon Jan 17 2022 Justin M. Forbes <jforbes@fedoraproject.org> [5.17-0.rc0.20220117git0c947b893d69.68] +- Move CONFIG_SND_SOC_TLV320AIC31XX as it is now selected by CONFIG_SND_SOC_FSL_ASOC_CARD (Justin M. Forbes) + +* Mon Jan 17 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.17-0.rc0.20220117git0c947b893d69.68] - lib/crypto: add prompts back to crypto libraries (Justin M. Forbes) * Fri Jan 14 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.17-0.rc0.20220114gitfb3b0673b7d5.64] |