diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-11-25 06:13:21 +0100 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-11-25 06:13:21 +0100 |
commit | 7f7ff77785c0a2e64b12f98fcce17fd021aeccc1 (patch) | |
tree | 001a72f837a42621653307ae8c6ec83eb7e288ad /kernel.spec | |
parent | 121dabf2a653b60b703e4c706711ea13cfd51f85 (diff) | |
parent | f381a440d3fa5705253011402f9e856e58f40f46 (diff) | |
download | kernel-7f7ff77785c0a2e64b12f98fcce17fd021aeccc1.tar.gz kernel-7f7ff77785c0a2e64b12f98fcce17fd021aeccc1.tar.xz kernel-7f7ff77785c0a2e64b12f98fcce17fd021aeccc1.zip |
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-5.16.0-0.rc2.20211124git5d9f4cf36721.19.vanilla.1.fc35
Diffstat (limited to 'kernel.spec')
-rwxr-xr-x | kernel.spec | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/kernel.spec b/kernel.spec index 00e84a845..93672a985 100755 --- a/kernel.spec +++ b/kernel.spec @@ -83,9 +83,9 @@ Summary: The Linux kernel # Set debugbuildsenabled to 0 to not build a separate debug kernel, but # to build the base kernel using the debug configuration. (Specifying # the --with-release option overrides this setting.) -%define debugbuildsenabled 1 +%define debugbuildsenabled 0 -%global distro_build 0.rc2.18 +%global distro_build 0.rc2.20211124git5d9f4cf36721.19 %if 0%{?fedora} %define secure_boot_arch x86_64 @@ -132,13 +132,13 @@ Summary: The Linux kernel %define rpmversion 5.16.0 %define patchversion 5.16 -%define pkgrelease 0.rc2.18 +%define pkgrelease 0.rc2.20211124git5d9f4cf36721.19 # This is needed to do merge window version magic %define patchlevel 16 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc2.18%{?buildid}%{?dist} +%define specrelease 0.rc2.20211124git5d9f4cf36721.19%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -684,7 +684,7 @@ BuildRequires: lld # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-5.16-rc2.tar.xz +Source0: linux-5.16-rc2-54-g5d9f4cf36721.tar.xz Source1: Makefile.rhelver @@ -1376,8 +1376,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.16-rc2 -c -mv linux-5.16-rc2 linux-%{KVERREL} +%setup -q -n kernel-5.16-rc2-54-g5d9f4cf36721 -c +mv linux-5.16-rc2-54-g5d9f4cf36721 linux-%{KVERREL} cd linux-%{KVERREL} # cp -a %{SOURCE1} . @@ -2978,6 +2978,11 @@ fi # # %changelog +* Wed Nov 24 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.16-0.rc2.20211124git5d9f4cf36721.19] +- Fix up PREEMPT configs (Justin M. Forbes) +- New configs in drivers/media (Fedora Kernel Team) +- New configs in drivers/net/ethernet/litex (Fedora Kernel Team) + * Sat Nov 20 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.16-0.rc1.20211120gita90af8f15bdc.17] - spec: add bpf_testmod.ko to kselftests/bpf (Viktor Malik) |