rpms/kernel
9
4
Fork 6
Code Issues Pull Requests Releases Activity

Debrand for AlmaLinux OS

Browse Source 
Use AlmaLinux OS secure boot cert

Enable Btrfs support for all kernel variants

hpsa: bring back deprecated PCI ids #CFHack #CFHack2024

mptsas: bring back deprecated PCI ids #CFHack #CFHack2024

megaraid_sas: bring back deprecated PCI ids #CFHack #CFHack2024

qla2xxx: bring back deprecated PCI ids #CFHack #CFHack2024

qla4xxx: bring back deprecated PCI ids

be2iscsi: bring back deprecated PCI ids

kernel/rh_messages.h: enable all disabled pci devices by moving to unmaintained
This commit is contained in:
Eduard Abdullin 2026-04-25 02:01:17 +00:00 committed by root
parent 7d979a5c0c
commit 6a643afc13
7 changed files with 186 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.rhelver
View File

@ -12,7 +12,7 @@ RHEL_MINOR = 3
#
# Use this spot to avoid future merge conflicts.
# Do not trim this comment.
RHEL_RELEASE = 223
RHEL_RELEASE = 224
#
# RHEL_REBASE_NUM

2
kernel-x86_64-debug-rhel.config
View File

@ -242,7 +242,7 @@ CONFIG_AMD_HFI=y
CONFIG_AMD_HSMP_ACPI=m
CONFIG_AMD_HSMP=m
CONFIG_AMD_HSMP_PLAT=m
# CONFIG_AMD_IOMMU_DEBUGFS is not set
CONFIG_AMD_IOMMU_DEBUGFS=y
CONFIG_AMD_IOMMU_IOMMUFD=y
CONFIG_AMD_IOMMU=y
CONFIG_AMD_ISP_PLATFORM=m

2
kernel-x86_64-rt-debug-rhel.config
View File

@ -242,7 +242,7 @@ CONFIG_AMD_HFI=y
CONFIG_AMD_HSMP_ACPI=m
CONFIG_AMD_HSMP=m
CONFIG_AMD_HSMP_PLAT=m
# CONFIG_AMD_IOMMU_DEBUGFS is not set
CONFIG_AMD_IOMMU_DEBUGFS=y
CONFIG_AMD_IOMMU_IOMMUFD=y
CONFIG_AMD_IOMMU=y
CONFIG_AMD_ISP_PLATFORM=m

62
kernel.changelog
View File

@ -1,3 +1,65 @@
* Tue Apr 21 2026 CKI KWF Bot <cki-ci-bot+kwf-gitlab-com@redhat.com> [6.12.0-224.el10]
- tools/power turbostat: Allow execution to continue after perf_l2_init() failure (Steve Best) [RHEL-129778]
- tools/power turbostat: Fix delimiter bug in print functions (Steve Best) [RHEL-129778]
- tools/power turbostat: Fix --show/--hide for individual cpuidle counters (Steve Best) [RHEL-129778]
- tools/power turbostat: Fix incorrect format variable (Steve Best) [RHEL-129778]
- tools/power turbostat: Consistently use print_float_value() (Steve Best) [RHEL-129778]
- tools/power/turbostat: Fix microcode patch level output for AMD/Hygon (Steve Best) [RHEL-129778]
- tools/power turbostat: Eliminate unnecessary data structure allocation (Steve Best) [RHEL-129778]
- tools/power turbostat: Fix swidle header vs data display (Steve Best) [RHEL-129778]
- tools/power turbostat: Fix illegal memory access when SMT is present and disabled (Steve Best) [RHEL-129778]
- tools/power turbostat: Fix AMD RAPL regression (Steve Best) [RHEL-129778]
- tools/power turbostat: version 2026.02.14 (Steve Best) [RHEL-129778]
- tools/power turbostat: Fix and document --header_iterations (Steve Best) [RHEL-129778]
- tools/power turbostat: Use strtoul() for iteration parsing (Steve Best) [RHEL-129778]
- tools/power turbostat: Favor cpu# over core# (Steve Best) [RHEL-129778]
- tools/power turbostat: Expunge logical_cpu_id (Steve Best) [RHEL-129778]
- tools/power turbostat: Enhance HT enumeration (Steve Best) [RHEL-129778]
- tools/power turbostat: Simplify global core_id calculation (Steve Best) [RHEL-129778]
- tools/power turbostat: Unify even/odd/average counter referencing (Steve Best) [RHEL-129778]
- tools/power turbostat: Allocate average counters dynamically (Steve Best) [RHEL-129778]
- tools/power turbostat: Delete core_data.core_id (Steve Best) [RHEL-129778]
- tools/power turbostat: Rename physical_core_id to core_id (Steve Best) [RHEL-129778]
- tools/power turbostat: Cleanup package_id (Steve Best) [RHEL-129778]
- tools/power turbostat: Cleanup internal use of "base_cpu" (Steve Best) [RHEL-129778]
- tools/power turbostat: Add L2 cache statistics (Steve Best) [RHEL-129778]
- tools/power turbostat: Remove redundant newlines from err(3) strings (Steve Best) [RHEL-129778]
- tools/power turbostat: Allow more use of is_hybrid flag (Steve Best) [RHEL-129778]
- tools/power turbostat: Rename "LLCkRPS" column to "LLCMRPS" (Steve Best) [RHEL-129778]
- tools/power turbostat.8: Document the "--force" option (Steve Best) [RHEL-129778]
- tools/power turbostat.8: Document Totl%%C0, Any%%C0, GFX%%C0, CPUGFX%% columns (Steve Best) [RHEL-129778]
- tools/power turbostat: Harden against unexpected values (Steve Best) [RHEL-129778]
- tools/power turbostat: Dump hypervisor name (Steve Best) [RHEL-129778]
- tools/power turbostat: Dump CPUID.1.ECX[31] (Hypervisor) (Steve Best) [RHEL-129778]
- tools/power turbostat: Dump CPUID(1) consistently with CPUID(6) (Steve Best) [RHEL-129778]
- tools/power turbostat: AMD: msr offset 0x611 read failed: Input/output error (Steve Best) [RHEL-129778]
- tools/power turbostat: version 2025.12.02 (Steve Best) [RHEL-129778]
- tools/power turbostat: Print wide names only for RAW 64-bit columns (Steve Best) [RHEL-129778]
- tools/power turbostat: Print percentages in 8-columns (Steve Best) [RHEL-129778]
- tools/power turbostat: Print "nan" for out of range percentages (Steve Best) [RHEL-129778]
- tools/power turbostat: Validate APERF access for VMWARE (Steve Best) [RHEL-129778]
- tools/power turbostat: Enhance perf probe (Steve Best) [RHEL-129778]
- tools/power turbostat: Validate RAPL MSRs for AWS Nitro Hypervisor (Steve Best) [RHEL-129778]
- tools/power turbostat: Add run-time MSR driver probe (Steve Best) [RHEL-129778]
- tools/power turbostat: Set per_cpu_msr_sum to NULL after free (Steve Best) [RHEL-129778]
- tools/power turbostat: Add LLC stats (Steve Best) [RHEL-129778]
- tools/power turbostat.8: fix typo: idle_pct should be pct_idle (Steve Best) [RHEL-129778]
- tools/power turbostat: Remove dead code (Steve Best) [RHEL-129778]
- tools/power turbostat: Refactor floating point printout code (Steve Best) [RHEL-129778]
- tools/power turbostat.8: Update example (Steve Best) [RHEL-129778]
- tools/power turbostat: Refactor added-counter value printing code (Steve Best) [RHEL-129778]
- tools/power turbostat: Refactor added column header printing (Steve Best) [RHEL-129778]
- tools/power turbostat: Add Wildcat Lake and Nova Lake support (Steve Best) [RHEL-129778]
- tools/power turbostat: Regression fix Uncore MHz printed in hex (Steve Best) [RHEL-129778]
- net/sched: Only allow act_ct to bind to clsact/ingress qdiscs and shared blocks (CKI Backport Bot) [RHEL-164343] {CVE-2026-23270}
- Prevent stripping of rtla and rv binaries during install (John Kacur) [RHEL-85865 RHEL-85868]
- Fix rtla and rv debuginfo package definitions (John Kacur) [RHEL-85865 RHEL-85868]
- Add debuginfo package for rtla tool (John Kacur) [RHEL-85865 RHEL-85868]
- Add debuginfo package for rv tool (John Kacur) [RHEL-85865 RHEL-85868]
- iommu/amd: Fix potential out-of-bounds read in iommu_mmio_show (Jerry Snitselaar) [RHEL-140474]
- redhat/configs: Enable AMD IOMMU DebugFS support (Jerry Snitselaar) [RHEL-140474]
Resolves: RHEL-129778, RHEL-140474, RHEL-145204, RHEL-164343, RHEL-85865, RHEL-85868
* Fri Apr 17 2026 CKI KWF Bot <cki-ci-bot+kwf-gitlab-com@redhat.com> [6.12.0-223.el10]
- nfsd: fix heap overflow in NFSv4.0 LOCK replay cache (CKI Backport Bot) [RHEL-168570] {CVE-2026-31402}
- mmc: rtsx_pci_sdmmc: implement sdmmc_card_busy function (Desnes Nunes) [RHEL-147795]

129
kernel.spec
View File

@ -6,7 +6,10 @@
# Disable frame pointers
%undefine _include_frame_pointers
# Disable LTO in userspace packages.
# Save default LTO flags before disabling (for use with kernel tools).
%global _default_lto_cflags %{_lto_cflags}
# Disable LTO in userspace packages (disabled for perf).
%global _lto_cflags %{nil}
# Option to enable compiling with clang instead of gcc.
@ -176,15 +179,15 @@ Summary: The Linux kernel
%define specrpmversion 6.12.0
%define specversion 6.12.0
%define patchversion 6.12
%define pkgrelease 223
%define pkgrelease 224
%define kversion 6
%define tarfile_release 6.12.0-223.el10
%define tarfile_release 6.12.0-224.el10
# This is needed to do merge window version magic
%define patchlevel 12
# This allows pkg_release to have configurable %%{?dist} tag
%define specrelease 223%{?buildid}%{?dist}
%define specrelease 224%{?buildid}%{?dist}
# This defines the kabi tarball version
%define kabiversion 6.12.0-223.el10
%define kabiversion 6.12.0-224.el10
# If this variable is set to 1, a bpf selftests build failure will cause a
# fatal kernel package build error
@ -1380,6 +1383,24 @@ the real-time properties of Linux. Instead of testing Linux as a black box,
rtla leverages kernel tracing capabilities to provide precise information
about the properties and root causes of unexpected results.
%if %{with_debuginfo}
%package -n rtla-debuginfo
%if 0%{gemini}
Epoch: %{gemini}
%endif
Summary: Debug information for package rtla
Requires: %{name}-debuginfo-common-%{_target_cpu} = %{version}-%{release}
AutoReqProv: no
%description -n rtla-debuginfo
This package provides debug information for the rtla package.
# Note that this pattern only works right to match the .build-id
# symlinks because of the trailing nonmatching alternation and
# the leading .*, because of find-debuginfo.sh's buggy handling
# of matching the pattern against the symlinks file.
%{expand:%%global _find_debuginfo_opts %{?_find_debuginfo_opts} -p '.*%%{_bindir}/rtla(\.debug)?|.*%%{_bindir}/hwnoise(\.debug)?|.*%%{_bindir}/osnoise(\.debug)?|.*%%{_bindir}/timerlat(\.debug)?|XXX' -o rtla-debuginfo.list}
%endif
%package -n rv
Summary: RV: Runtime Verification
%description -n rv
@ -1388,7 +1409,22 @@ complements classical exhaustive verification techniques (such as model
checking and theorem proving) with a more practical approach for
complex systems.
The rv tool is the interface for a collection of monitors that aim
analysing the logical and timing behavior of Linux.
to analyze the logical and timing behavior of Linux.
%if %{with_debuginfo}
%package -n rv-debuginfo
Summary: Debug information for package rv
Requires: %{name}-debuginfo-common-%{_target_cpu} = %{version}-%{release}
AutoReqProv: no
%description -n rv-debuginfo
This package provides debug information for the rv package.
# Note that this pattern only works right to match the .build-id
# symlinks because of the trailing nonmatching alternation and
# the leading .*, because of find-debuginfo.sh's buggy handling
# of matching the pattern against the symlinks file.
%{expand:%%global _find_debuginfo_opts %{?_find_debuginfo_opts} -p '.*%%{_bindir}/rv(\.debug)?|XXX' -o rv-debuginfo.list}
%endif
# with_tools
%endif
@ -3146,7 +3182,7 @@ chmod +x tools/perf/check-headers.sh
%endif
%global tools_make \
CFLAGS="${RPM_OPT_FLAGS}" LDFLAGS="%{__global_ldflags}" EXTRA_CFLAGS="${RPM_OPT_FLAGS}" %{make} %{?make_opts}
CFLAGS="${RPM_OPT_FLAGS} %{_default_lto_cflags}" LDFLAGS="%{__global_ldflags}" EXTRA_CFLAGS="${RPM_OPT_FLAGS} %{_default_lto_cflags}" %{make} %{?make_opts}
%ifarch %{cpupowerarchs}
# link against in-tree libcpupower for idle state support
@ -3585,10 +3621,10 @@ install -m755 slabinfo %{buildroot}%{_bindir}/slabinfo
install -m755 page_owner_sort %{buildroot}%{_bindir}/page_owner_sort
popd
pushd tools/verification/rv/
%{tools_make} DESTDIR=%{buildroot} install
%{tools_make} DESTDIR=%{buildroot} STRIP=/bin/true install
popd
pushd tools/tracing/rtla/
%{tools_make} DESTDIR=%{buildroot} install
%{tools_make} DESTDIR=%{buildroot} STRIP=/bin/true install
rm -f %{buildroot}%{_bindir}/hwnoise
rm -f %{buildroot}%{_bindir}/osnoise
rm -f %{buildroot}%{_bindir}/timerlat
@ -4320,6 +4356,10 @@ fi\
%{_mandir}/man1/rtla-timerlat.1.gz
%{_mandir}/man1/rtla.1.gz
%if %{with_debuginfo}
%files -f rtla-debuginfo.list -n rtla-debuginfo
%endif
%files -n rv
%{_bindir}/rv
%{_mandir}/man1/rv-list.1.gz
@ -4329,6 +4369,10 @@ fi\
%{_mandir}/man1/rv-mon-sched.1.gz
%{_mandir}/man1/rv.1.gz
%if %{with_debuginfo}
%files -f rv-debuginfo.list -n rv-debuginfo
%endif
# with_tools
%endif
@ -4508,14 +4552,14 @@ fi\
#
#
%changelog
* Wed Apr 22 2026 Eduard Abdullin <eabdullin@almalinux.org> - 6.12.0-223
* Sat Apr 25 2026 Eduard Abdullin <eabdullin@almalinux.org> - 6.12.0-224
- Debrand for AlmaLinux OS
- Use AlmaLinux OS secure boot cert
* Wed Apr 22 2026 Neal Gompa <ngompa@almalinux.org> - 6.12.0-223
* Sat Apr 25 2026 Neal Gompa <ngompa@almalinux.org> - 6.12.0-224
- Enable Btrfs support for all kernel variants
* Wed Apr 22 2026 Andrew Lukoshko <alukoshko@almalinux.org> - 6.12.0-223
* Sat Apr 25 2026 Andrew Lukoshko <alukoshko@almalinux.org> - 6.12.0-224
- hpsa: bring back deprecated PCI ids #CFHack #CFHack2024
- mptsas: bring back deprecated PCI ids #CFHack #CFHack2024
- megaraid_sas: bring back deprecated PCI ids #CFHack #CFHack2024
@ -4525,6 +4569,67 @@ fi\
- kernel/rh_messages.h: enable all disabled pci devices by moving to
unmaintained
* Tue Apr 21 2026 CKI KWF Bot <cki-ci-bot+kwf-gitlab-com@redhat.com> [6.12.0-224.el10]
- tools/power turbostat: Allow execution to continue after perf_l2_init() failure (Steve Best) [RHEL-129778]
- tools/power turbostat: Fix delimiter bug in print functions (Steve Best) [RHEL-129778]
- tools/power turbostat: Fix --show/--hide for individual cpuidle counters (Steve Best) [RHEL-129778]
- tools/power turbostat: Fix incorrect format variable (Steve Best) [RHEL-129778]
- tools/power turbostat: Consistently use print_float_value() (Steve Best) [RHEL-129778]
- tools/power/turbostat: Fix microcode patch level output for AMD/Hygon (Steve Best) [RHEL-129778]
- tools/power turbostat: Eliminate unnecessary data structure allocation (Steve Best) [RHEL-129778]
- tools/power turbostat: Fix swidle header vs data display (Steve Best) [RHEL-129778]
- tools/power turbostat: Fix illegal memory access when SMT is present and disabled (Steve Best) [RHEL-129778]
- tools/power turbostat: Fix AMD RAPL regression (Steve Best) [RHEL-129778]
- tools/power turbostat: version 2026.02.14 (Steve Best) [RHEL-129778]
- tools/power turbostat: Fix and document --header_iterations (Steve Best) [RHEL-129778]
- tools/power turbostat: Use strtoul() for iteration parsing (Steve Best) [RHEL-129778]
- tools/power turbostat: Favor cpu# over core# (Steve Best) [RHEL-129778]
- tools/power turbostat: Expunge logical_cpu_id (Steve Best) [RHEL-129778]
- tools/power turbostat: Enhance HT enumeration (Steve Best) [RHEL-129778]
- tools/power turbostat: Simplify global core_id calculation (Steve Best) [RHEL-129778]
- tools/power turbostat: Unify even/odd/average counter referencing (Steve Best) [RHEL-129778]
- tools/power turbostat: Allocate average counters dynamically (Steve Best) [RHEL-129778]
- tools/power turbostat: Delete core_data.core_id (Steve Best) [RHEL-129778]
- tools/power turbostat: Rename physical_core_id to core_id (Steve Best) [RHEL-129778]
- tools/power turbostat: Cleanup package_id (Steve Best) [RHEL-129778]
- tools/power turbostat: Cleanup internal use of "base_cpu" (Steve Best) [RHEL-129778]
- tools/power turbostat: Add L2 cache statistics (Steve Best) [RHEL-129778]
- tools/power turbostat: Remove redundant newlines from err(3) strings (Steve Best) [RHEL-129778]
- tools/power turbostat: Allow more use of is_hybrid flag (Steve Best) [RHEL-129778]
- tools/power turbostat: Rename "LLCkRPS" column to "LLCMRPS" (Steve Best) [RHEL-129778]
- tools/power turbostat.8: Document the "--force" option (Steve Best) [RHEL-129778]
- tools/power turbostat.8: Document Totl%%C0, Any%%C0, GFX%%C0, CPUGFX%% columns (Steve Best) [RHEL-129778]
- tools/power turbostat: Harden against unexpected values (Steve Best) [RHEL-129778]
- tools/power turbostat: Dump hypervisor name (Steve Best) [RHEL-129778]
- tools/power turbostat: Dump CPUID.1.ECX[31] (Hypervisor) (Steve Best) [RHEL-129778]
- tools/power turbostat: Dump CPUID(1) consistently with CPUID(6) (Steve Best) [RHEL-129778]
- tools/power turbostat: AMD: msr offset 0x611 read failed: Input/output error (Steve Best) [RHEL-129778]
- tools/power turbostat: version 2025.12.02 (Steve Best) [RHEL-129778]
- tools/power turbostat: Print wide names only for RAW 64-bit columns (Steve Best) [RHEL-129778]
- tools/power turbostat: Print percentages in 8-columns (Steve Best) [RHEL-129778]
- tools/power turbostat: Print "nan" for out of range percentages (Steve Best) [RHEL-129778]
- tools/power turbostat: Validate APERF access for VMWARE (Steve Best) [RHEL-129778]
- tools/power turbostat: Enhance perf probe (Steve Best) [RHEL-129778]
- tools/power turbostat: Validate RAPL MSRs for AWS Nitro Hypervisor (Steve Best) [RHEL-129778]
- tools/power turbostat: Add run-time MSR driver probe (Steve Best) [RHEL-129778]
- tools/power turbostat: Set per_cpu_msr_sum to NULL after free (Steve Best) [RHEL-129778]
- tools/power turbostat: Add LLC stats (Steve Best) [RHEL-129778]
- tools/power turbostat.8: fix typo: idle_pct should be pct_idle (Steve Best) [RHEL-129778]
- tools/power turbostat: Remove dead code (Steve Best) [RHEL-129778]
- tools/power turbostat: Refactor floating point printout code (Steve Best) [RHEL-129778]
- tools/power turbostat.8: Update example (Steve Best) [RHEL-129778]
- tools/power turbostat: Refactor added-counter value printing code (Steve Best) [RHEL-129778]
- tools/power turbostat: Refactor added column header printing (Steve Best) [RHEL-129778]
- tools/power turbostat: Add Wildcat Lake and Nova Lake support (Steve Best) [RHEL-129778]
- tools/power turbostat: Regression fix Uncore MHz printed in hex (Steve Best) [RHEL-129778]
- net/sched: Only allow act_ct to bind to clsact/ingress qdiscs and shared blocks (CKI Backport Bot) [RHEL-164343] {CVE-2026-23270}
- Prevent stripping of rtla and rv binaries during install (John Kacur) [RHEL-85865 RHEL-85868]
- Fix rtla and rv debuginfo package definitions (John Kacur) [RHEL-85865 RHEL-85868]
- Add debuginfo package for rtla tool (John Kacur) [RHEL-85865 RHEL-85868]
- Add debuginfo package for rv tool (John Kacur) [RHEL-85865 RHEL-85868]
- iommu/amd: Fix potential out-of-bounds read in iommu_mmio_show (Jerry Snitselaar) [RHEL-140474]
- redhat/configs: Enable AMD IOMMU DebugFS support (Jerry Snitselaar) [RHEL-140474]
* Fri Apr 17 2026 CKI KWF Bot <cki-ci-bot+kwf-gitlab-com@redhat.com> [6.12.0-223.el10]
- nfsd: fix heap overflow in NFSv4.0 LOCK replay cache (CKI Backport Bot) [RHEL-168570] {CVE-2026-31402}
- mmc: rtsx_pci_sdmmc: implement sdmmc_card_busy function (Desnes Nunes) [RHEL-147795]

1
rpminspect.yaml
View File

@ -73,3 +73,4 @@ annocheck:
- /lib/modules/*/vmlinuz
- /lib/modules/*/vdso/*
- /usr/libexec/ksamples/*
- /usr/sbin/intel_sdsi

6
sources
View File

@ -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.12.0-223.el10.tar.xz) = a0e283bd8574d3df32f686a11a4d0c8153c4a7e955c8c32b41a3f58a4a4661ca9d8b1a75425c07c3eec53892f05b80aafe8c9612075097624ea05e72760fef93
SHA512 (kernel-abi-stablelists-6.12.0-223.el10.tar.xz) = 07529c6dd41239fcb6a456f5f73f4cf4c5cd2f2029103af1d4bd9a1a04fc3711cc33a97078dea787d280e46d5591a13da98696226b7ef1bf7856e6a62e371149
SHA512 (kernel-kabi-dw-6.12.0-223.el10.tar.xz) = 4af2ed2ae826f963b1032754856d16156dd7fd494e055954ffc855c40bd850b9211074cf100d61736a5393b9fc2471ae71853a3ae923c592e5a9fe1b4d1c060b
SHA512 (linux-6.12.0-224.el10.tar.xz) = 13f2b9460fb2590c99c2dddac946073060100ff36400d9513c413eab94a01cf666279ec0253493e7bffc7da1a4491cd9871e65e4362e9293ccf602b49db16255
SHA512 (kernel-abi-stablelists-6.12.0-224.el10.tar.xz) = 02f2f76bfe18c4d5aeb52961762441564dd84e17371b9253ed501cd2f8369c20463b9ddecff8943392185b29a4527539de9016a3f3fb79542f874d402fbf5b4e
SHA512 (kernel-kabi-dw-6.12.0-224.el10.tar.xz) = e8113f08b2fee5d9da6ac0a316fe64feb7f8048a541f5c76eb63cbfae8a8a1f42569dd21da0d20f6409d3c96d02ee66ef038bf90a6c1d1eed93d567953ff5025