diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-12-09 18:13:58 +0100 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-12-09 18:13:58 +0100 |
commit | d06f04ce6a2b511a79bda13af4a9530f4fc0c430 (patch) | |
tree | e7970804c9100a1127c6db7e1601b541c003431c /kernel.spec | |
parent | 15deaa97a3ec6ee91df53664cdde1b58921dc7ec (diff) | |
parent | 2846922f06bf0c792cb4ac41ec483183a594d3c7 (diff) | |
download | kernel-d06f04ce6a2b511a79bda13af4a9530f4fc0c430.tar.gz kernel-d06f04ce6a2b511a79bda13af4a9530f4fc0c430.tar.xz kernel-d06f04ce6a2b511a79bda13af4a9530f4fc0c430.zip |
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-5.16.0-0.rc4.20211208git2a987e65025e.31.vanilla.1.fc36kernel-5.16.0-0.rc4.20211208git2a987e65025e.31.vanilla.1.fc35kernel-5.16.0-0.rc4.20211208git2a987e65025e.31.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 49fe05e14..be373b649 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.rc4.20211207gitcd8c917a56f2.30 +%global distro_build 0.rc4.20211208git2a987e65025e.31 %if 0%{?fedora} %define secure_boot_arch x86_64 @@ -134,13 +134,13 @@ Summary: The Linux kernel %define rpmversion 5.16.0 %define patchversion 5.16 -%define pkgrelease 0.rc4.20211207gitcd8c917a56f2.30 +%define pkgrelease 0.rc4.20211208git2a987e65025e.31 # This is needed to do merge window version magic %define patchlevel 16 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc4.20211207gitcd8c917a56f2.30%{?buildid}%{?dist} +%define specrelease 0.rc4.20211208git2a987e65025e.31%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -691,7 +691,7 @@ BuildRequires: lld # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-5.16-rc4-12-gcd8c917a56f2.tar.xz +Source0: linux-5.16-rc4-31-g2a987e65025e.tar.xz Source1: Makefile.rhelver @@ -1385,8 +1385,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.16-rc4-12-gcd8c917a56f2 -c -mv linux-5.16-rc4-12-gcd8c917a56f2 linux-%{KVERREL} +%setup -q -n kernel-5.16-rc4-31-g2a987e65025e -c +mv linux-5.16-rc4-31-g2a987e65025e linux-%{KVERREL} cd linux-%{KVERREL} # cp -a %{SOURCE1} . @@ -2987,6 +2987,10 @@ fi # # %changelog +* Wed Dec 08 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.16-0.rc4.20211208git2a987e65025e.31] +- common: arm64: ensure all the required arm64 errata are enabled (Peter Robinson) +- kernel/rh_taint.c: Update to new messaging (Prarit Bhargava) [2019377] + * Tue Dec 07 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.16-0.rc4.20211207gitcd8c917a56f2.30] - redhat/configs: enable CONFIG_AMD_PTDMA for ark (John W. Linville) - redhat/configs: enable CONFIG_RD_ZSTD for rhel (Tao Liu) [2020132] |