diff --git a/Makefile.rhelver b/Makefile.rhelver index 3554f91af..4ef64a680 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 = 19 +RHEL_RELEASE = 20 # # RHEL_REBASE_NUM diff --git a/Patchlist.changelog b/Patchlist.changelog index 0339f82fb..96fbfe28a 100644 --- a/Patchlist.changelog +++ b/Patchlist.changelog @@ -1,3 +1,6 @@ +https://gitlab.com/cki-project/kernel-ark/-/commit/0d1c1cce5327e44d9f59c34357278da9e95fa3cd + 0d1c1cce5327e44d9f59c34357278da9e95fa3cd blk-throttle: Fix incorrect display of io.max + https://gitlab.com/cki-project/kernel-ark/-/commit/6b58b8c1db5679fc8f0bba7d494431cdde1ca696 6b58b8c1db5679fc8f0bba7d494431cdde1ca696 rh_flags: Rename rh_features to rh_flags diff --git a/kernel.changelog b/kernel.changelog index eb9485c02..b216492f5 100644 --- a/kernel.changelog +++ b/kernel.changelog @@ -1,3 +1,7 @@ +* Thu May 30 2024 Fedora Kernel Team [6.10.0-0.rc1.4a4be1ad3a6e.20] +- Linux v6.10.0-0.rc1.4a4be1ad3a6e +Resolves: + * Wed May 29 2024 Fedora Kernel Team [6.10.0-0.rc1.e0cce98fe279.19] - gitlab-ci: add kernel-automotive pipelines (Michael Hofmann) - Enable CEC support for TC358743 (Peter Robinson) diff --git a/kernel.spec b/kernel.spec index 656cdfcd1..1e4c7982c 100644 --- a/kernel.spec +++ b/kernel.spec @@ -163,13 +163,13 @@ Summary: The Linux kernel %define specrpmversion 6.10.0 %define specversion 6.10.0 %define patchversion 6.10 -%define pkgrelease 0.rc1.20240529gite0cce98fe279.19 +%define pkgrelease 0.rc1.20240530git4a4be1ad3a6e.20 %define kversion 6 -%define tarfile_release 6.10-rc1-21-ge0cce98fe279 +%define tarfile_release 6.10-rc1-27-g4a4be1ad3a6e # This is needed to do merge window version magic %define patchlevel 10 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc1.20240529gite0cce98fe279.19%{?buildid}%{?dist} +%define specrelease 0.rc1.20240530git4a4be1ad3a6e.20%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.10.0 @@ -4001,6 +4001,12 @@ fi\ # # %changelog +* Thu May 30 2024 Justin M. Forbes [6.10.0-0.rc1.20240530git4a4be1ad3a6e.20] +- blk-throttle: Fix incorrect display of io.max (Waiman Long) + +* Thu May 30 2024 Fedora Kernel Team [6.10.0-0.rc1.4a4be1ad3a6e.20] +- Linux v6.10.0-0.rc1.4a4be1ad3a6e + * Wed May 29 2024 Fedora Kernel Team [6.10.0-0.rc1.e0cce98fe279.19] - gitlab-ci: add kernel-automotive pipelines (Michael Hofmann) - Enable CEC support for TC358743 (Peter Robinson) diff --git a/patch-6.10-redhat.patch b/patch-6.10-redhat.patch index 2ab79e6db..03ea982e7 100644 --- a/patch-6.10-redhat.patch +++ b/patch-6.10-redhat.patch @@ -9,6 +9,8 @@ arch/s390/kernel/setup.c | 4 + arch/x86/kernel/cpu/common.c | 1 + arch/x86/kernel/setup.c | 98 +++- + block/blk-throttle.c | 24 +- + block/blk-throttle.h | 8 +- crypto/drbg.c | 18 +- crypto/rng.c | 149 +++++- drivers/acpi/apei/hest.c | 8 + @@ -73,7 +75,7 @@ security/lockdown/Kconfig | 13 + security/lockdown/lockdown.c | 1 + security/security.c | 12 + - 75 files changed, 2518 insertions(+), 207 deletions(-) + 77 files changed, 2532 insertions(+), 225 deletions(-) diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt index 500cfa776225..8de03fac88fc 100644 @@ -407,6 +409,77 @@ index 05c5aa951da7..09c1ad947f46 100644 unwind_init(); } +diff --git a/block/blk-throttle.c b/block/blk-throttle.c +index 0be180f9a789..c1bf73f8c75d 100644 +--- a/block/blk-throttle.c ++++ b/block/blk-throttle.c +@@ -1399,32 +1399,32 @@ static u64 tg_prfill_limit(struct seq_file *sf, struct blkg_policy_data *pd, + bps_dft = U64_MAX; + iops_dft = UINT_MAX; + +- if (tg->bps_conf[READ] == bps_dft && +- tg->bps_conf[WRITE] == bps_dft && +- tg->iops_conf[READ] == iops_dft && +- tg->iops_conf[WRITE] == iops_dft) ++ if (tg->bps[READ] == bps_dft && ++ tg->bps[WRITE] == bps_dft && ++ tg->iops[READ] == iops_dft && ++ tg->iops[WRITE] == iops_dft) + return 0; + + seq_printf(sf, "%s", dname); +- if (tg->bps_conf[READ] == U64_MAX) ++ if (tg->bps[READ] == U64_MAX) + seq_printf(sf, " rbps=max"); + else +- seq_printf(sf, " rbps=%llu", tg->bps_conf[READ]); ++ seq_printf(sf, " rbps=%llu", tg->bps[READ]); + +- if (tg->bps_conf[WRITE] == U64_MAX) ++ if (tg->bps[WRITE] == U64_MAX) + seq_printf(sf, " wbps=max"); + else +- seq_printf(sf, " wbps=%llu", tg->bps_conf[WRITE]); ++ seq_printf(sf, " wbps=%llu", tg->bps[WRITE]); + +- if (tg->iops_conf[READ] == UINT_MAX) ++ if (tg->iops[READ] == UINT_MAX) + seq_printf(sf, " riops=max"); + else +- seq_printf(sf, " riops=%u", tg->iops_conf[READ]); ++ seq_printf(sf, " riops=%u", tg->iops[READ]); + +- if (tg->iops_conf[WRITE] == UINT_MAX) ++ if (tg->iops[WRITE] == UINT_MAX) + seq_printf(sf, " wiops=max"); + else +- seq_printf(sf, " wiops=%u", tg->iops_conf[WRITE]); ++ seq_printf(sf, " wiops=%u", tg->iops[WRITE]); + + seq_printf(sf, "\n"); + return 0; +diff --git a/block/blk-throttle.h b/block/blk-throttle.h +index 393c3d134b96..4d9ef5abdf21 100644 +--- a/block/blk-throttle.h ++++ b/block/blk-throttle.h +@@ -95,15 +95,11 @@ struct throtl_grp { + bool has_rules_bps[2]; + bool has_rules_iops[2]; + +- /* internally used bytes per second rate limits */ ++ /* bytes per second rate limits */ + uint64_t bps[2]; +- /* user configured bps limits */ +- uint64_t bps_conf[2]; + +- /* internally used IOPS limits */ ++ /* IOPS limits */ + unsigned int iops[2]; +- /* user configured IOPS limits */ +- unsigned int iops_conf[2]; + + /* Number of bytes dispatched in current slice */ + uint64_t bytes_disp[2]; diff --git a/crypto/drbg.c b/crypto/drbg.c index 3addce90930c..730b03de596a 100644 --- a/crypto/drbg.c diff --git a/sources b/sources index 47798649b..9672bc3cf 100644 --- a/sources +++ b/sources @@ -1,5 +1,5 @@ SHA512 (kernel-abi-stablelists-6.6.0.tar.bz2) = 4f917598056dee5e23814621ec96ff2e4a411c8c4ba9d56ecb01b23cb96431825bedbecfcbaac9338efbf5cb21694d85497fa0bf43e7c80d9cd10bc6dd144dbd SHA512 (kernel-kabi-dw-6.6.0.tar.bz2) = 19308cd976031d05e18ef7f5d093218acdb89446418bab0cd956ff12cf66369915b9e64bb66fa9f20939428a60e81884fec5be3529c6c7461738d6540d3cc5c6 -SHA512 (linux-6.10-rc1-21-ge0cce98fe279.tar.xz) = 1572de9174a0e50558847007ccf848c534190250f47a09568892b48d7309bf91107578cf8a8c8059050362ef5a61942d0980c9204f7a79fefe005356bd9548b6 -SHA512 (kernel-abi-stablelists-6.10.0.tar.xz) = ec43b28dd3826c971d2eebd953d57984c7c8ffe4e0220a39700c0ccaa70302a51e605a3a551e23a850b77d7c89b8e4165b9cfc79aea6cb434cf71e74e554d3bd -SHA512 (kernel-kabi-dw-6.10.0.tar.xz) = 0c3e34c01a701cd8948a50f18e6abebda549df08f3d66f9ceaf1cafc799c17735d6a833d527279929caa15eb7976f2981acf8a4a61e81e2cd96926b9d6705ac3 +SHA512 (linux-6.10-rc1-27-g4a4be1ad3a6e.tar.xz) = d9209b2a1096759c6729f9f2c5e59fc70cdf69b38d52971605db0a8d050f6845191fe3e4b0d3b0e92f80fea3fd66c2f33c96a8e06b365b8b98e9fa487997cfb4 +SHA512 (kernel-abi-stablelists-6.10.0.tar.xz) = 89213b1c9fd9927314e7f32e0ae105c654e23aca5f5340202d992424118988db9e253c26bcf2d16b3a679d62544c256bc8ca2d3097e22664ffd60613994542f7 +SHA512 (kernel-kabi-dw-6.10.0.tar.xz) = 6bf116117094f897f603fbeddee735a034ec2d10a0553d8a076f86f9f97a18527838637e55767696c0d95408033df7be1765f93174debba9c75a73d307c357bd