diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-08-19 07:37:53 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-08-19 07:37:53 +0200 |
commit | a0804a4c5aa0e300a789c96b34d56f876e7ca0ed (patch) | |
tree | 6c9f8a27c6e022b792d4e341db52623d542e110a /kernel.spec | |
parent | 11bfcb6c26e170eb588c0db7e7ae0c7f91062e3e (diff) | |
parent | 3596b69021696dc9dc9a16ae72bf2c50b4a960b6 (diff) | |
download | kernel-a0804a4c5aa0e300a789c96b34d56f876e7ca0ed.tar.gz kernel-a0804a4c5aa0e300a789c96b34d56f876e7ca0ed.tar.xz kernel-a0804a4c5aa0e300a789c96b34d56f876e7ca0ed.zip |
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-5.14.0-0.rc6.20210818git614cb2751d31.48.vanilla.1.fc34
Diffstat (limited to 'kernel.spec')
-rwxr-xr-x | kernel.spec | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/kernel.spec b/kernel.spec index 8bffb2b63..002f7b64e 100755 --- a/kernel.spec +++ b/kernel.spec @@ -80,7 +80,7 @@ Summary: The Linux kernel # the --with-release option overrides this setting.) %define debugbuildsenabled 0 -%global distro_build 0.rc6.20210817git794c7931a242.47 +%global distro_build 0.rc6.20210818git614cb2751d31.48 %if 0%{?fedora} %define secure_boot_arch x86_64 @@ -126,13 +126,13 @@ Summary: The Linux kernel %define kversion 5.14 %define rpmversion 5.14.0 -%define pkgrelease 0.rc6.20210817git794c7931a242.47 +%define pkgrelease 0.rc6.20210818git614cb2751d31.48 # This is needed to do merge window version magic %define patchlevel 14 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc6.20210817git794c7931a242.47%{?buildid}%{?dist} +%define specrelease 0.rc6.20210818git614cb2751d31.48%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -673,7 +673,7 @@ BuildRequires: lld # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-5.14-rc6-41-g794c7931a242.tar.xz +Source0: linux-5.14-rc6-43-g614cb2751d31.tar.xz Source1: Makefile.rhelver @@ -1359,8 +1359,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.14-rc6-41-g794c7931a242 -c -mv linux-5.14-rc6-41-g794c7931a242 linux-%{KVERREL} +%setup -q -n kernel-5.14-rc6-43-g614cb2751d31 -c +mv linux-5.14-rc6-43-g614cb2751d31 linux-%{KVERREL} cd linux-%{KVERREL} # cp -a %{SOURCE1} . @@ -2958,6 +2958,10 @@ fi # # %changelog +* Wed Aug 18 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.14.0-0.rc6.20210818git614cb2751d31.48] +- Filter updates for aarch64 (Justin M. Forbes) +- increase CONFIG_NODES_SHIFT for aarch64 (Chris von Recklinghausen) [1890304] + * Tue Aug 17 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.14.0-0.rc6.20210817git794c7931a242.47] - Revert "redhat: ark: disable CONFIG_NET_SCH_MULTIQ" (Marcelo Ricardo Leitner) - redhat: configs: Enable CONFIG_WIRELESS_HOTKEY (Hans de Goede) |