import CS kernel-5.14.0-570.5.1.el9_6

This commit is contained in:
Andrew Lukoshko 2025-03-28 14:32:56 +00:00
parent d1ec4acc9b
commit 9545379a85
24 changed files with 163 additions and 44 deletions

6
.gitignore vendored
View File

@ -1,6 +1,6 @@
SOURCES/kernel-abi-stablelists-5.14.0-570.el9.tar.bz2
SOURCES/kernel-kabi-dw-5.14.0-570.el9.tar.bz2
SOURCES/linux-5.14.0-570.el9.tar.xz
SOURCES/kernel-abi-stablelists-5.14.0-570.5.1.el9_6.tar.bz2
SOURCES/kernel-kabi-dw-5.14.0-570.5.1.el9_6.tar.bz2
SOURCES/linux-5.14.0-570.5.1.el9_6.tar.xz
SOURCES/nvidiagpuoot001.x509
SOURCES/rheldup3.x509
SOURCES/rhelima.x509

View File

@ -1,6 +1,6 @@
2cb11f5c47d07215a30ebe4455590bd314122a6c SOURCES/kernel-abi-stablelists-5.14.0-570.el9.tar.bz2
8ad0f0cba66e3ca08f516527634cdd76eb3d7c5e SOURCES/kernel-kabi-dw-5.14.0-570.el9.tar.bz2
189a3a074e412b936a7f896bdb7cc3c4696014e2 SOURCES/linux-5.14.0-570.el9.tar.xz
dd2b1736da67d2ca2d8f35fd8bfba73d30fb98f3 SOURCES/kernel-abi-stablelists-5.14.0-570.5.1.el9_6.tar.bz2
8dc54e9218efa4996268d279bba133d97a7de60e SOURCES/kernel-kabi-dw-5.14.0-570.5.1.el9_6.tar.bz2
00ff64b313fc9482e73b2e7ecf311cde2180dcee SOURCES/linux-5.14.0-570.5.1.el9_6.tar.xz
4fff8080e88afffc06d8ef5004db8d53bb21237f SOURCES/nvidiagpuoot001.x509
95b9b811c7b0a6c98b2eafc4e7d6d24f2cb63289 SOURCES/rheldup3.x509
99e571f9de4188f3b5fdf1f84ff73f6cc4bb6a0e SOURCES/rhelima.x509

View File

@ -12,7 +12,7 @@ RHEL_MINOR = 6
#
# Use this spot to avoid future merge conflicts.
# Do not trim this comment.
RHEL_RELEASE = 570
RHEL_RELEASE = 570.5.1
#
# ZSTREAM
@ -34,7 +34,7 @@ RHEL_RELEASE = 570
# (when you give RHDISTGIT_BRANCH on the command line, in which case the Z
# number will be incremented instead of the Y).
#
ZSTREAM ?= no
ZSTREAM ?= yes
#
# Early y+1 numbering

View File

@ -1404,6 +1404,8 @@ CONFIG_DPLL=y
# CONFIG_DPS310 is not set
# CONFIG_DRAGONRISE_FF is not set
CONFIG_DRIVER_PE_KUNIT_TEST=m
# CONFIG_DRM_ACCEL is not set
# CONFIG_DRM_ACCEL_IVPU is not set
CONFIG_DRM_AMD_ACP=y
# CONFIG_DRM_AMD_DC_HDCP is not set
# CONFIG_DRM_AMD_DC_SI is not set

View File

@ -1396,6 +1396,8 @@ CONFIG_DPLL=y
# CONFIG_DPS310 is not set
# CONFIG_DRAGONRISE_FF is not set
CONFIG_DRIVER_PE_KUNIT_TEST=m
# CONFIG_DRM_ACCEL is not set
# CONFIG_DRM_ACCEL_IVPU is not set
CONFIG_DRM_AMD_ACP=y
# CONFIG_DRM_AMD_DC_HDCP is not set
# CONFIG_DRM_AMD_DC_SI is not set

View File

@ -1402,6 +1402,8 @@ CONFIG_DPLL=y
# CONFIG_DPS310 is not set
# CONFIG_DRAGONRISE_FF is not set
CONFIG_DRIVER_PE_KUNIT_TEST=m
# CONFIG_DRM_ACCEL is not set
# CONFIG_DRM_ACCEL_IVPU is not set
CONFIG_DRM_AMD_ACP=y
# CONFIG_DRM_AMD_DC_HDCP is not set
# CONFIG_DRM_AMD_DC_SI is not set

View File

@ -1394,6 +1394,8 @@ CONFIG_DPLL=y
# CONFIG_DPS310 is not set
# CONFIG_DRAGONRISE_FF is not set
CONFIG_DRIVER_PE_KUNIT_TEST=m
# CONFIG_DRM_ACCEL is not set
# CONFIG_DRM_ACCEL_IVPU is not set
CONFIG_DRM_AMD_ACP=y
# CONFIG_DRM_AMD_DC_HDCP is not set
# CONFIG_DRM_AMD_DC_SI is not set

View File

@ -1422,6 +1422,8 @@ CONFIG_DPLL=y
# CONFIG_DPS310 is not set
# CONFIG_DRAGONRISE_FF is not set
CONFIG_DRIVER_PE_KUNIT_TEST=m
# CONFIG_DRM_ACCEL is not set
# CONFIG_DRM_ACCEL_IVPU is not set
CONFIG_DRM_AMD_ACP=y
# CONFIG_DRM_AMD_DC_HDCP is not set
# CONFIG_DRM_AMD_DC_SI is not set

View File

@ -1414,6 +1414,8 @@ CONFIG_DPLL=y
# CONFIG_DPS310 is not set
# CONFIG_DRAGONRISE_FF is not set
CONFIG_DRIVER_PE_KUNIT_TEST=m
# CONFIG_DRM_ACCEL is not set
# CONFIG_DRM_ACCEL_IVPU is not set
CONFIG_DRM_AMD_ACP=y
# CONFIG_DRM_AMD_DC_HDCP is not set
# CONFIG_DRM_AMD_DC_SI is not set

View File

@ -1420,6 +1420,8 @@ CONFIG_DPLL=y
# CONFIG_DPS310 is not set
# CONFIG_DRAGONRISE_FF is not set
CONFIG_DRIVER_PE_KUNIT_TEST=m
# CONFIG_DRM_ACCEL is not set
# CONFIG_DRM_ACCEL_IVPU is not set
CONFIG_DRM_AMD_ACP=y
# CONFIG_DRM_AMD_DC_HDCP is not set
# CONFIG_DRM_AMD_DC_SI is not set

View File

@ -1412,6 +1412,8 @@ CONFIG_DPLL=y
# CONFIG_DPS310 is not set
# CONFIG_DRAGONRISE_FF is not set
CONFIG_DRIVER_PE_KUNIT_TEST=m
# CONFIG_DRM_ACCEL is not set
# CONFIG_DRM_ACCEL_IVPU is not set
CONFIG_DRM_AMD_ACP=y
# CONFIG_DRM_AMD_DC_HDCP is not set
# CONFIG_DRM_AMD_DC_SI is not set

View File

@ -1177,6 +1177,8 @@ CONFIG_DPLL=y
# CONFIG_DPS310 is not set
# CONFIG_DRAGONRISE_FF is not set
CONFIG_DRIVER_PE_KUNIT_TEST=m
# CONFIG_DRM_ACCEL is not set
# CONFIG_DRM_ACCEL_IVPU is not set
CONFIG_DRM_AMD_ACP=y
# CONFIG_DRM_AMD_DC_HDCP is not set
# CONFIG_DRM_AMD_DC_SI is not set

View File

@ -1169,6 +1169,8 @@ CONFIG_DPLL=y
# CONFIG_DPS310 is not set
# CONFIG_DRAGONRISE_FF is not set
CONFIG_DRIVER_PE_KUNIT_TEST=m
# CONFIG_DRM_ACCEL is not set
# CONFIG_DRM_ACCEL_IVPU is not set
CONFIG_DRM_AMD_ACP=y
# CONFIG_DRM_AMD_DC_HDCP is not set
# CONFIG_DRM_AMD_DC_SI is not set

View File

@ -1181,6 +1181,8 @@ CONFIG_DPLL=y
# CONFIG_DPS310 is not set
# CONFIG_DRAGONRISE_FF is not set
CONFIG_DRIVER_PE_KUNIT_TEST=m
# CONFIG_DRM_ACCEL is not set
# CONFIG_DRM_ACCEL_IVPU is not set
CONFIG_DRM_AMD_ACP=y
# CONFIG_DRM_AMD_DC_HDCP is not set
# CONFIG_DRM_AMD_DC_SI is not set

View File

@ -1173,6 +1173,8 @@ CONFIG_DPLL=y
# CONFIG_DPS310 is not set
# CONFIG_DRAGONRISE_FF is not set
CONFIG_DRIVER_PE_KUNIT_TEST=m
# CONFIG_DRM_ACCEL is not set
# CONFIG_DRM_ACCEL_IVPU is not set
CONFIG_DRM_AMD_ACP=y
# CONFIG_DRM_AMD_DC_HDCP is not set
# CONFIG_DRM_AMD_DC_SI is not set

View File

@ -1178,6 +1178,8 @@ CONFIG_DPLL=y
# CONFIG_DPS310 is not set
# CONFIG_DRAGONRISE_FF is not set
CONFIG_DRIVER_PE_KUNIT_TEST=m
# CONFIG_DRM_ACCEL is not set
# CONFIG_DRM_ACCEL_IVPU is not set
CONFIG_DRM_AMD_ACP=y
# CONFIG_DRM_AMD_DC_HDCP is not set
# CONFIG_DRM_AMD_DC_SI is not set

View File

@ -1247,6 +1247,9 @@ CONFIG_DPTF_PCH_FIVR=m
CONFIG_DPTF_POWER=m
# CONFIG_DRAGONRISE_FF is not set
CONFIG_DRIVER_PE_KUNIT_TEST=m
# CONFIG_DRM_ACCEL_IVPU_DEBUG is not set
CONFIG_DRM_ACCEL_IVPU=m
CONFIG_DRM_ACCEL=y
CONFIG_DRM_AMD_ACP=y
# CONFIG_DRM_AMD_DC_HDCP is not set
# CONFIG_DRM_AMD_DC_SI is not set

View File

@ -1239,6 +1239,9 @@ CONFIG_DPTF_PCH_FIVR=m
CONFIG_DPTF_POWER=m
# CONFIG_DRAGONRISE_FF is not set
CONFIG_DRIVER_PE_KUNIT_TEST=m
# CONFIG_DRM_ACCEL_IVPU_DEBUG is not set
CONFIG_DRM_ACCEL_IVPU=m
CONFIG_DRM_ACCEL=y
CONFIG_DRM_AMD_ACP=y
# CONFIG_DRM_AMD_DC_HDCP is not set
# CONFIG_DRM_AMD_DC_SI is not set

View File

@ -1267,6 +1267,9 @@ CONFIG_DPTF_PCH_FIVR=m
CONFIG_DPTF_POWER=m
# CONFIG_DRAGONRISE_FF is not set
CONFIG_DRIVER_PE_KUNIT_TEST=m
# CONFIG_DRM_ACCEL_IVPU_DEBUG is not set
CONFIG_DRM_ACCEL_IVPU=m
CONFIG_DRM_ACCEL=y
CONFIG_DRM_AMD_ACP=y
# CONFIG_DRM_AMD_DC_HDCP is not set
# CONFIG_DRM_AMD_DC_SI is not set

View File

@ -1259,6 +1259,9 @@ CONFIG_DPTF_PCH_FIVR=m
CONFIG_DPTF_POWER=m
# CONFIG_DRAGONRISE_FF is not set
CONFIG_DRIVER_PE_KUNIT_TEST=m
# CONFIG_DRM_ACCEL_IVPU_DEBUG is not set
CONFIG_DRM_ACCEL_IVPU=m
CONFIG_DRM_ACCEL=y
CONFIG_DRM_AMD_ACP=y
# CONFIG_DRM_AMD_DC_HDCP is not set
# CONFIG_DRM_AMD_DC_SI is not set

View File

@ -1,3 +1,49 @@
* Tue Mar 18 2025 CKI KWF Bot <cki-ci-bot+kwf-gitlab-com@redhat.com> [5.14.0-570.5.1.el9_6]
- configs: enable IVPU driver on RHEL (Karol Herbst) [RHEL-38583]
- accel: add build system changes (Karol Herbst) [RHEL-38583]
- accel: backport ivpu driver from v6.12 (Karol Herbst) [RHEL-38583]
Resolves: RHEL-38583
* Fri Mar 14 2025 CKI KWF Bot <cki-ci-bot+kwf-gitlab-com@redhat.com> [5.14.0-570.4.1.el9_6]
- rhel_files: ensure all qdiscs are in modules-core (Davide Caratti) [RHEL-79818]
- Revert "mm: add vma_has_recency()" (Luiz Capitulino) [RHEL-80655]
- Revert "mm: support POSIX_FADV_NOREUSE" (Luiz Capitulino) [RHEL-80655]
- phy: tegra: xusb: reset VBUS & ID OVERRIDE (Rupinderjit Singh) [RHEL-80628]
- smb: client: fix chmod(2) regression with ATTR_READONLY (Jay Shin) [RHEL-80527 RHEL-78507]
- scsi: megaraid_sas: Fix for a potential deadlock (Tomas Henzl) [RHEL-21980] {CVE-2024-57807}
- scsi: core: Fix command pass through retry regression (Ewan D. Milne) [RHEL-77122]
Resolves: RHEL-21980, RHEL-77122, RHEL-79818, RHEL-80527, RHEL-80628, RHEL-80655
* Fri Mar 07 2025 CKI KWF Bot <cki-ci-bot+kwf-gitlab-com@redhat.com> [5.14.0-570.3.1.el9_6]
- fs/proc: fix softlockup in __read_vmcore (part 2) (Baoquan He) [RHEL-79112] {CVE-2025-21694}
- RDMA/mlx5: Fix a WARN during dereg_mr for DM type (Benjamin Poirier) [RHEL-49958 RHEL-6641 RHEL-77115]
- CVE-2025-1272: security: Re-enable lockdown LSM in some setup_arch() (Lenny Szubowicz) [RHEL-78974] {CVE-2025-1272}
Resolves: RHEL-49958, RHEL-6641, RHEL-77115, RHEL-78974, RHEL-79112
* Wed Mar 05 2025 CKI KWF Bot <cki-ci-bot+kwf-gitlab-com@redhat.com> [5.14.0-570.2.1.el9_6]
- redhat/self-test: Remove --all from git query (Prarit Bhargava)
- redhat: fix selftest git command so it picks the right commit (Patrick Talbert)
- arm64: mm: Fix zone_dma_limit calculation (Luiz Capitulino) [RHEL-71914]
- Documentation/powerpc/fadump: add additional parameter feature details (Mamatha Inamdar) [RHEL-74219]
- powerpc: increase MIN RMA size for CAS negotiation (Mamatha Inamdar) [RHEL-74219]
- powerpc/fadump: fix additional param memory reservation for HASH MMU (Mamatha Inamdar) [RHEL-74219]
- powerpc: export MIN RMA size (Mamatha Inamdar) [RHEL-74219]
- cxgb4: use port number to set mac addr (Michal Schmidt) [RHEL-75514]
Resolves: RHEL-71914, RHEL-74219, RHEL-75514
* Fri Feb 28 2025 CKI KWF Bot <cki-ci-bot+kwf-gitlab-com@redhat.com> [5.14.0-570.1.1.el9_6]
- pps: Fix a use-after-free (Michal Schmidt) [RHEL-9309]
- gitlab-ci: add jobs for rhel9 automotive pipelines (Michael Hofmann)
- gitlab-ci: clean up trigger job naming and template inheritance (Michael Hofmann)
- can: bcm: Fix UAF in bcm_proc_show() (Michal Schmidt) [RHEL-80748] {CVE-2023-52922}
- redhat: change DIST to .el9_6 (Patrick Talbert)
- redhat: change to zstream version numbering for 9.6 (Patrick Talbert)
- Revert "x86/kvm: Override default caching mode for SEV-SNP and TDX" (Vitaly Kuznetsov) [RHEL-75512]
- idpf: call set_real_num_queues in idpf_open (Michal Schmidt) [RHEL-68688]
- scsi: st: Don't set pos_unknown just after device recognition (John Meneghini) [RHEL-78429]
- scsi: sg: Fix slab-use-after-free read in sg_release() (Ewan D. Milne) [RHEL-75864] {CVE-2024-56631}
Resolves: RHEL-68688, RHEL-75512, RHEL-75864, RHEL-78429, RHEL-80748, RHEL-9309
* Mon Feb 17 2025 Patrick Talbert <ptalbert@redhat.com> [5.14.0-570.el9]
- rhel-9: gate on kernel-qe tests results not cki ones (Bruno Goncalves)
- USB: serial: quatech2: fix null-ptr-deref in qt2_process_read_urb() (CKI Backport Bot) [RHEL-78682] {CVE-2025-21689}

View File

@ -119,19 +119,6 @@ rds.ko
rds_rdma.ko
rds_tcp.ko
rose.ko
sch_atm.ko
sch_cbq.ko
sch_choke.ko
sch_drr.ko
sch_dsmark.ko
sch_gred.ko
sch_mqprio.ko
sch_multiq.ko
sch_netem.ko
sch_qfq.ko
sch_red.ko
sch_sfb.ko
sch_teql.ko
sctp.ko
sctp_diag.ko
sctp_probe.ko

View File

@ -1,45 +1,45 @@
{
"virt": {
"common": {
"fips-disable.addon": [
"fips=0\n"
],
"fips-enable.addon": [
"fips=1\n"
]
},
"rhel": {
"aarch64": {
"crashkernel-default.addon": [
"crashkernel=1G-4G:256M,4G-64G:320M,64G-:576M\n"
]
}
},
"common": {
"fips-enable.addon": [
"fips=1\n"
],
"fips-disable.addon": [
"fips=0\n"
]
}
},
"common": {
"crashkernel-1536M.addon": [
"crashkernel=1536M\n"
"crashkernel-512M.addon": [
"crashkernel=512M\n"
],
"crashkernel-192M.addon": [
"crashkernel=192M\n"
],
"crashkernel-2G.addon": [
"crashkernel=2G\n"
],
"crashkernel-1536M.addon": [
"crashkernel=1536M\n"
],
"debug.addon": [
"debug\n"
],
"crashkernel-1G.addon": [
"crashkernel=1G\n"
],
"crashkernel-256M.addon": [
"crashkernel=256M\n"
],
"crashkernel-2G.addon": [
"crashkernel=2G\n"
],
"crashkernel-512M.addon": [
"crashkernel=512M\n"
],
"crashkernel-default.addon": [
"crashkernel=1G-4G:192M,4G-64G:256M,64G-:512M\n"
],
"debug.addon": [
"debug\n"
]
}
}

View File

@ -165,15 +165,15 @@ Summary: The Linux kernel
# define buildid .local
%define specversion 5.14.0
%define patchversion 5.14
%define pkgrelease 570
%define pkgrelease 570.5.1
%define kversion 5
%define tarfile_release 5.14.0-570.el9
%define tarfile_release 5.14.0-570.5.1.el9_6
# This is needed to do merge window version magic
%define patchlevel 14
# This allows pkg_release to have configurable %%{?dist} tag
%define specrelease 570%{?buildid}%{?dist}
%define specrelease 570.5.1%{?buildid}%{?dist}
# This defines the kabi tarball version
%define kabiversion 5.14.0-570.el9
%define kabiversion 5.14.0-570.5.1.el9_6
#
# End of genspec.sh variables
@ -185,6 +185,7 @@ Summary: The Linux kernel
# should not be exported to RPM provides
%global __provides_exclude_from ^%{_libexecdir}/kselftests
%define _with_kabidupchk 1
# The following build options are enabled by default, but may become disabled
# by later architecture-specific checks. These can also be disabled by using
# --without <opt> in the rpmbuild command, or by forcing these values to 0.
@ -3785,6 +3786,53 @@ fi
#
#
%changelog
* Fri Mar 28 2025 Andrew Lukoshko <alukoshko@almalinux.org> [5.14.0-570.5.1.el9_6]
- AlmaLinux changes (Andrew Lukoshko)
- Merge tag 'kernel-5.14.0-570.5.1.el9_6' into main (Jan Stancek)
- Merge tag 'kernel-5.14.0-570.4.1.el9_6' into main (Jan Stancek)
- Merge tag 'kernel-5.14.0-570.3.1.el9_6' into 'main' (Patrick Talbert)
* Tue Mar 18 2025 CKI KWF Bot <cki-ci-bot+kwf-gitlab-com@redhat.com> [5.14.0-570.5.1.el9_6]
- configs: enable IVPU driver on RHEL (Karol Herbst) [RHEL-38583]
- accel: add build system changes (Karol Herbst) [RHEL-38583]
- accel: backport ivpu driver from v6.12 (Karol Herbst) [RHEL-38583]
* Fri Mar 14 2025 CKI KWF Bot <cki-ci-bot+kwf-gitlab-com@redhat.com> [5.14.0-570.4.1.el9_6]
- rhel_files: ensure all qdiscs are in modules-core (Davide Caratti) [RHEL-79818]
- Revert "mm: add vma_has_recency()" (Luiz Capitulino) [RHEL-80655]
- Revert "mm: support POSIX_FADV_NOREUSE" (Luiz Capitulino) [RHEL-80655]
- phy: tegra: xusb: reset VBUS & ID OVERRIDE (Rupinderjit Singh) [RHEL-80628]
- smb: client: fix chmod(2) regression with ATTR_READONLY (Jay Shin) [RHEL-80527 RHEL-78507]
- scsi: megaraid_sas: Fix for a potential deadlock (Tomas Henzl) [RHEL-21980] {CVE-2024-57807}
- scsi: core: Fix command pass through retry regression (Ewan D. Milne) [RHEL-77122]
* Fri Mar 07 2025 CKI KWF Bot <cki-ci-bot+kwf-gitlab-com@redhat.com> [5.14.0-570.3.1.el9_6]
- fs/proc: fix softlockup in __read_vmcore (part 2) (Baoquan He) [RHEL-79112] {CVE-2025-21694}
- RDMA/mlx5: Fix a WARN during dereg_mr for DM type (Benjamin Poirier) [RHEL-49958 RHEL-6641 RHEL-77115]
- CVE-2025-1272: security: Re-enable lockdown LSM in some setup_arch() (Lenny Szubowicz) [RHEL-78974] {CVE-2025-1272}
* Wed Mar 05 2025 CKI KWF Bot <cki-ci-bot+kwf-gitlab-com@redhat.com> [5.14.0-570.2.1.el9_6]
- redhat/self-test: Remove --all from git query (Prarit Bhargava)
- redhat: fix selftest git command so it picks the right commit (Patrick Talbert)
- arm64: mm: Fix zone_dma_limit calculation (Luiz Capitulino) [RHEL-71914]
- Documentation/powerpc/fadump: add additional parameter feature details (Mamatha Inamdar) [RHEL-74219]
- powerpc: increase MIN RMA size for CAS negotiation (Mamatha Inamdar) [RHEL-74219]
- powerpc/fadump: fix additional param memory reservation for HASH MMU (Mamatha Inamdar) [RHEL-74219]
- powerpc: export MIN RMA size (Mamatha Inamdar) [RHEL-74219]
- cxgb4: use port number to set mac addr (Michal Schmidt) [RHEL-75514]
* Fri Feb 28 2025 CKI KWF Bot <cki-ci-bot+kwf-gitlab-com@redhat.com> [5.14.0-570.1.1.el9_6]
- pps: Fix a use-after-free (Michal Schmidt) [RHEL-9309]
- gitlab-ci: add jobs for rhel9 automotive pipelines (Michael Hofmann)
- gitlab-ci: clean up trigger job naming and template inheritance (Michael Hofmann)
- can: bcm: Fix UAF in bcm_proc_show() (Michal Schmidt) [RHEL-80748] {CVE-2023-52922}
- redhat: change DIST to .el9_6 (Patrick Talbert)
- redhat: change to zstream version numbering for 9.6 (Patrick Talbert)
- Revert "x86/kvm: Override default caching mode for SEV-SNP and TDX" (Vitaly Kuznetsov) [RHEL-75512]
- idpf: call set_real_num_queues in idpf_open (Michal Schmidt) [RHEL-68688]
- scsi: st: Don't set pos_unknown just after device recognition (John Meneghini) [RHEL-78429]
- scsi: sg: Fix slab-use-after-free read in sg_release() (Ewan D. Milne) [RHEL-75864] {CVE-2024-56631}
* Mon Feb 17 2025 Patrick Talbert <ptalbert@redhat.com> [5.14.0-570.el9]
- rhel-9: gate on kernel-qe tests results not cki ones (Bruno Goncalves)
- USB: serial: quatech2: fix null-ptr-deref in qt2_process_read_urb() (CKI Backport Bot) [RHEL-78682] {CVE-2025-21689}