diff --git a/Makefile.rhelver b/Makefile.rhelver index bd68da515..3943824d4 100644 --- a/Makefile.rhelver +++ b/Makefile.rhelver @@ -12,7 +12,7 @@ RHEL_MINOR = 99 # # Use this spot to avoid future merge conflicts. # Do not trim this comment. -RHEL_RELEASE = 14 +RHEL_RELEASE = 16 # # RHEL_REBASE_NUM diff --git a/Patchlist.changelog b/Patchlist.changelog index 241dc71f9..32a7ee074 100644 --- a/Patchlist.changelog +++ b/Patchlist.changelog @@ -1,3 +1,6 @@ +https://gitlab.com/cki-project/kernel-ark/-/commit/60ca890555955158a61ad24839b8b7abac1babd0 + 60ca890555955158a61ad24839b8b7abac1babd0 x86/insn_decoder_test: allow longer symbol-names + https://gitlab.com/cki-project/kernel-ark/-/commit/c4589d81040a97b7adb381203b68b893f5df7b1c c4589d81040a97b7adb381203b68b893f5df7b1c crypto: sig - Disable signing diff --git a/kernel-riscv64-debug-fedora.config b/kernel-riscv64-debug-fedora.config index 3e38f3ebb..7dfdac145 100644 --- a/kernel-riscv64-debug-fedora.config +++ b/kernel-riscv64-debug-fedora.config @@ -5225,11 +5225,11 @@ CONFIG_PPTP=m CONFIG_PREEMPT_DYNAMIC=y # CONFIG_PREEMPTIRQ_DELAY_TEST is not set # CONFIG_PREEMPT is not set -# CONFIG_PREEMPT_LAZY is not set +CONFIG_PREEMPT_LAZY=y # CONFIG_PREEMPT_NONE is not set # CONFIG_PREEMPT_RT is not set # CONFIG_PREEMPT_TRACER is not set -CONFIG_PREEMPT_VOLUNTARY=y +# CONFIG_PREEMPT_VOLUNTARY is not set CONFIG_PRESTERA=m CONFIG_PRESTERA_PCI=m CONFIG_PREVENT_FIRMWARE_BUILD=y diff --git a/kernel-riscv64-fedora.config b/kernel-riscv64-fedora.config index ece52c295..ff04b5a08 100644 --- a/kernel-riscv64-fedora.config +++ b/kernel-riscv64-fedora.config @@ -5197,11 +5197,11 @@ CONFIG_PPTP=m CONFIG_PREEMPT_DYNAMIC=y # CONFIG_PREEMPTIRQ_DELAY_TEST is not set # CONFIG_PREEMPT is not set -# CONFIG_PREEMPT_LAZY is not set +CONFIG_PREEMPT_LAZY=y # CONFIG_PREEMPT_NONE is not set # CONFIG_PREEMPT_RT is not set # CONFIG_PREEMPT_TRACER is not set -CONFIG_PREEMPT_VOLUNTARY=y +# CONFIG_PREEMPT_VOLUNTARY is not set CONFIG_PRESTERA=m CONFIG_PRESTERA_PCI=m CONFIG_PREVENT_FIRMWARE_BUILD=y diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config index e9e53f72d..520176400 100644 --- a/kernel-x86_64-debug-fedora.config +++ b/kernel-x86_64-debug-fedora.config @@ -5644,11 +5644,11 @@ CONFIG_PPTP=m CONFIG_PREEMPT_DYNAMIC=y # CONFIG_PREEMPTIRQ_DELAY_TEST is not set # CONFIG_PREEMPT is not set -# CONFIG_PREEMPT_LAZY is not set +CONFIG_PREEMPT_LAZY=y # CONFIG_PREEMPT_NONE is not set # CONFIG_PREEMPT_RT is not set # CONFIG_PREEMPT_TRACER is not set -CONFIG_PREEMPT_VOLUNTARY=y +# CONFIG_PREEMPT_VOLUNTARY is not set CONFIG_PRESTERA=m CONFIG_PRESTERA_PCI=m CONFIG_PREVENT_FIRMWARE_BUILD=y diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config index 7d9b502d9..95814b9de 100644 --- a/kernel-x86_64-debug-rhel.config +++ b/kernel-x86_64-debug-rhel.config @@ -5013,12 +5013,12 @@ CONFIG_PPTP=m CONFIG_PREEMPT_DYNAMIC=y # CONFIG_PREEMPTIRQ_DELAY_TEST is not set # CONFIG_PREEMPT is not set -# CONFIG_PREEMPT_LAZY is not set +CONFIG_PREEMPT_LAZY=y # CONFIG_PREEMPT_NONE is not set CONFIG_PREEMPT_NOTIFIERS=y # CONFIG_PREEMPT_RT is not set # CONFIG_PREEMPT_TRACER is not set -CONFIG_PREEMPT_VOLUNTARY=y +# CONFIG_PREEMPT_VOLUNTARY is not set # CONFIG_PRESTERA is not set CONFIG_PREVENT_FIRMWARE_BUILD=y CONFIG_PRIME_NUMBERS=m diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index cc1f5affd..2ad23b0b8 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -5617,11 +5617,11 @@ CONFIG_PPTP=m CONFIG_PREEMPT_DYNAMIC=y # CONFIG_PREEMPTIRQ_DELAY_TEST is not set # CONFIG_PREEMPT is not set -# CONFIG_PREEMPT_LAZY is not set +CONFIG_PREEMPT_LAZY=y # CONFIG_PREEMPT_NONE is not set # CONFIG_PREEMPT_RT is not set # CONFIG_PREEMPT_TRACER is not set -CONFIG_PREEMPT_VOLUNTARY=y +# CONFIG_PREEMPT_VOLUNTARY is not set CONFIG_PRESTERA=m CONFIG_PRESTERA_PCI=m CONFIG_PREVENT_FIRMWARE_BUILD=y diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config index c882a1c34..5c1fa76e6 100644 --- a/kernel-x86_64-rhel.config +++ b/kernel-x86_64-rhel.config @@ -4991,12 +4991,12 @@ CONFIG_PPTP=m CONFIG_PREEMPT_DYNAMIC=y # CONFIG_PREEMPTIRQ_DELAY_TEST is not set # CONFIG_PREEMPT is not set -# CONFIG_PREEMPT_LAZY is not set +CONFIG_PREEMPT_LAZY=y # CONFIG_PREEMPT_NONE is not set CONFIG_PREEMPT_NOTIFIERS=y # CONFIG_PREEMPT_RT is not set # CONFIG_PREEMPT_TRACER is not set -CONFIG_PREEMPT_VOLUNTARY=y +# CONFIG_PREEMPT_VOLUNTARY is not set # CONFIG_PRESTERA is not set CONFIG_PREVENT_FIRMWARE_BUILD=y CONFIG_PRIME_NUMBERS=m diff --git a/kernel.changelog b/kernel.changelog index b76f19c13..1b28b26d5 100644 --- a/kernel.changelog +++ b/kernel.changelog @@ -1,3 +1,13 @@ +* Tue Dec 03 2024 Fedora Kernel Team [6.13.0-0.rc1.cdd30ebb1b9f.16] +- kernel.spec: update license field (Scott Weaver) +Resolves: + +* Tue Dec 03 2024 Fedora Kernel Team [6.13.0-0.rc1.cdd30ebb1b9f.15] +- redhat/configs: default to PREEMPT_LAZY on x86, riscv (Michal Schmidt) +- redhat/configs: New config CONFIG_PREEMPT_LAZY (Michal Schmidt) +- Linux v6.13.0-0.rc1.cdd30ebb1b9f +Resolves: + * Mon Dec 02 2024 Fedora Kernel Team [6.13.0-0.rc1.e70140ba0d2b.14] - Linux v6.13.0-0.rc1.e70140ba0d2b Resolves: diff --git a/kernel.spec b/kernel.spec index 19497d6ac..b086dca15 100644 --- a/kernel.spec +++ b/kernel.spec @@ -162,13 +162,13 @@ Summary: The Linux kernel %define specrpmversion 6.13.0 %define specversion 6.13.0 %define patchversion 6.13 -%define pkgrelease 0.rc1.20241202gite70140ba0d2b.14 +%define pkgrelease 0.rc1.20241203gitcdd30ebb1b9f.16 %define kversion 6 -%define tarfile_release 6.13-rc1-1-ge70140ba0d2b +%define tarfile_release 6.13-rc1-2-gcdd30ebb1b9f # This is needed to do merge window version magic %define patchlevel 13 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc1.20241202gite70140ba0d2b.14%{?buildid}%{?dist} +%define specrelease 0.rc1.20241203gitcdd30ebb1b9f.16%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.13.0 @@ -4164,6 +4164,17 @@ fi\ # # %changelog +* Tue Dec 03 2024 Justin M. Forbes [6.13.0-0.rc1.20241203gitcdd30ebb1b9f.16] +- x86/insn_decoder_test: allow longer symbol-names (David Rheinsberg) + +* Tue Dec 03 2024 Fedora Kernel Team [6.13.0-0.rc1.cdd30ebb1b9f.16] +- kernel.spec: update license field (Scott Weaver) + +* Tue Dec 03 2024 Fedora Kernel Team [6.13.0-0.rc1.cdd30ebb1b9f.15] +- redhat/configs: default to PREEMPT_LAZY on x86, riscv (Michal Schmidt) +- redhat/configs: New config CONFIG_PREEMPT_LAZY (Michal Schmidt) +- Linux v6.13.0-0.rc1.cdd30ebb1b9f + * Mon Dec 02 2024 Fedora Kernel Team [6.13.0-0.rc1.e70140ba0d2b.14] - Linux v6.13.0-0.rc1.e70140ba0d2b diff --git a/patch-6.13-redhat.patch b/patch-6.13-redhat.patch index a2c1b8a17..8d240d48d 100644 --- a/patch-6.13-redhat.patch +++ b/patch-6.13-redhat.patch @@ -569,7 +569,7 @@ index afc0fd847761..e13258c3d1d1 100644 } diff --git a/crypto/drbg.c b/crypto/drbg.c -index c323f40bed4f..ce40287abe40 100644 +index f28dfc2511a2..7ddda2ab4d7b 100644 --- a/crypto/drbg.c +++ b/crypto/drbg.c @@ -1495,13 +1495,14 @@ static int drbg_generate(struct drbg_state *drbg, @@ -897,7 +897,7 @@ index 5e1f1f739da2..3fc9fffa718e 100644 alg->verify = sig_default_verify; if (!alg->set_priv_key) diff --git a/crypto/testmgr.c b/crypto/testmgr.c -index 3fc908bac21a..84baaeba1623 100644 +index 1f5f48ab18c7..00a3810bff51 100644 --- a/crypto/testmgr.c +++ b/crypto/testmgr.c @@ -4200,7 +4200,7 @@ static int test_akcipher_one(struct crypto_akcipher *tfm, @@ -1863,7 +1863,7 @@ index 2168b6cd7167..5d7cda175a0c 100644 if (data->f01_container->dev.driver) { /* Driver already bound, so enable ATTN now. */ diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c -index 9bc0c74cca3c..c0700ba9f826 100644 +index 599030e1e890..74dd17d516c0 100644 --- a/drivers/iommu/iommu.c +++ b/drivers/iommu/iommu.c @@ -8,6 +8,7 @@ @@ -1980,7 +1980,7 @@ index a00671b58701..eeef2766b8b3 100644 if (ret < 0) goto err_allowedips; diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c -index 40e7be3b0339..a1a6d9e45056 100644 +index 52b01a15aad1..83a27a937430 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -276,6 +276,9 @@ void nvme_delete_ctrl_sync(struct nvme_ctrl *ctrl) @@ -2668,7 +2668,7 @@ index eb2937599cb0..7860721ef2f6 100644 #ifdef CONFIG_PERF_EVENTS LSM_HOOK(int, 0, perf_event_open, struct perf_event_attr *attr, int type) diff --git a/include/linux/module.h b/include/linux/module.h -index c60ee39cb9b1..5309daef5dcf 100644 +index 94acbacdcdf1..e4e6fc1bd393 100644 --- a/include/linux/module.h +++ b/include/linux/module.h @@ -426,6 +426,7 @@ struct module { diff --git a/sources b/sources index 48eaa771c..7bbc5f471 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-6.13-rc1-1-ge70140ba0d2b.tar.xz) = e358ce00fe46edbb9768b39cfe9d6d5671ef97bf91ed577c3eb629a457cef5d9d1a4f8cff3426925d33b92cc163d5ac4b36e0ab0674d77dd3658de825e708ed7 -SHA512 (kernel-abi-stablelists-6.13.0.tar.xz) = 3295aec9651f3df02dec4b9df01bccfdf038f62ac0300fade246c17b50fa3c83201e03cfa914e7209016925c0b8798141758d6e015b8e5da08bbb8873f25faff -SHA512 (kernel-kabi-dw-6.13.0.tar.xz) = edf81e98429767656e253ce0e94aecd80c668844b78282bf5c43675175b05649a94696314ab776141f4d8f80b029c94fe632f5b904e6098de88c1991fcd2476a +SHA512 (linux-6.13-rc1-2-gcdd30ebb1b9f.tar.xz) = 6bdbc397e608d9c89fc93882cd8fd170b56133ff6f0a8dec2efc878a225faf6776332c83a1ef453bd73dfb2626acc8cbc92a33e8202fcfa7e2631787c0a41f2a +SHA512 (kernel-abi-stablelists-6.13.0.tar.xz) = ccdda9b86d4b41d5a0ab2a5705add73b9610cd190dd358bcf28bcbe87301dd35fa47dbb9cea40679aadf2ef7d7886ff21a8058678ef8e6fca1e9283b72723e0e +SHA512 (kernel-kabi-dw-6.13.0.tar.xz) = cc940e959e29ab1aee05cc5b523bb34ac1ac24508072ba23b4a3c9f7e298a779d99f6256706f449feedeadc5ea3c188ac7e6b85a173322ee19d779a597b12731