diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-09-21 21:10:46 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-09-21 21:10:46 +0200 |
commit | fa58831aa93e86c451cc63fd315987a63dd5914e (patch) | |
tree | cb053af30b45217d8fe4a6e6e4f25fcf13afdcb8 /kernel.spec | |
parent | 25fdb065f3e2cb14bfb874bf83c9643a9c0c922e (diff) | |
parent | a94dbb8a971caa9bbcddab905c934423586cc404 (diff) | |
download | kernel-fa58831aa93e86c451cc63fd315987a63dd5914e.tar.gz kernel-fa58831aa93e86c451cc63fd315987a63dd5914e.tar.xz kernel-fa58831aa93e86c451cc63fd315987a63dd5914e.zip |
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-6.0.0-0.rc6.20220921git60891ec99e14.42.vanilla.1.fc37
Diffstat (limited to 'kernel.spec')
-rwxr-xr-x | kernel.spec | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/kernel.spec b/kernel.spec index 7cde82f32..d5a3da3e0 100755 --- a/kernel.spec +++ b/kernel.spec @@ -124,17 +124,17 @@ 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 # define buildid .local %define specversion 6.0.0 %define patchversion 6.0 -%define pkgrelease 0.rc6.41 +%define pkgrelease 0.rc6.20220921git60891ec99e14.42 %define kversion 6 -%define tarfile_release 6.0-rc6 +%define tarfile_release 6.0-rc6-9-g60891ec99e14 # This is needed to do merge window version magic %define patchlevel 0 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc6.41%{?buildid}%{?dist} +%define specrelease 0.rc6.20220921git60891ec99e14.42%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.0.0 @@ -3159,6 +3159,12 @@ fi # # %changelog +* Wed Sep 21 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.0.0-0.rc6.60891ec99e14.42] +- redhat/self-test: Ignore .rhpkg.mk files (Prarit Bhargava) +- redhat/configs: Enable CONFIG_PRINTK_INDEX on Fedora (Prarit Bhargava) +- redhat/configs: Cleanup CONFIG_X86_KERNEL_IBT (Prarit Bhargava) +- Linux v6.0.0-0.rc6.60891ec99e14 + * Mon Sep 19 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.0.0-0.rc6.41] - Linux v6.0.0-0.rc6 |