ykohut/kernel
1
0
Fork 0
forked from rpms/kernel
Code Pull Requests Activity

kernel-5.14.0-267.el9

Browse Source 
* Mon Feb 13 2023 Herton R. Krzesinski <herton@redhat.com> [5.14.0-267.el9]
- mmc: sdhci-tegra: Issue CMD and DAT resets together (Mark Salter) [2144641]
- mmc: sdhci-tegra: Add support to program MC stream ID (Mark Salter) [2144641]
- iommu/tegra: Add tegra_dev_iommu_get_stream_id() helper (Mark Salter) [2144641]
- mmc: sdhci-tegra: Sort includes alphabetically (Mark Salter) [2144641]
- mmc: sdhci-tegra: Separate Tegra194 and Tegra234 SoC data (Mark Salter) [2144641]
- mmc: sdhci: Centralize CMD and DATA reset handling (Mark Salter) [2144641]
- mmc: sdhci: Get rid of SDHCI_QUIRK_RESET_CMD_DATA_ON_IOS (Mark Salter) [2144641]
- mmc: sdhci: Remove misleading comment about resets (Mark Salter) [2144641]
- mmc: sdhci: Separate out sdhci_reset_for_all() (Mark Salter) [2144641]
- mmc: sdhci: Fix ADMA for PAGE_SIZE >= 64KiB (Mark Salter) [2144641]
- mmc: sdhci-pci: Remove dead code (rst_n_gpio et al) (Mark Salter) [2144641]
- mmc: sdhci-pci: Remove dead code (cd_gpio, cd_irq et al) (Mark Salter) [2144641]
- mmc: sdhci: Remove unused prototype declaration in the header (Mark Salter) [2144641]
- mmc: sdhci: Deduplicate sdhci_get_cd_nogpio() (Mark Salter) [2144641]
- mmc: sdhci-pci: Read card detect from ACPI for Intel Merrifield (Mark Salter) [2144641]
- mmc: sdhci: Return true only when timeout exceeds capacity of the HW timer (Mark Salter) [2144641]
- mmc: sdhci: Change the code to check auto_cmd23 (Mark Salter) [2144641]
- mmc: sdhci: Map more voltage level to SDHCI_POWER_330 (Mark Salter) [2144641]
- mmc: sdhci: Correct the tuning command handle for PIO mode (Mark Salter) [2144641]
- mmc: sdhci: Fix issue with uninitialized dma_slave_config (Mark Salter) [2144641]
- mmc: sdhci: Introduce max_timeout_count variable in sdhci_host (Mark Salter) [2144641]
- power: supply: samsung-sdi-battery: Add missing charge restart voltages (Al Stone) [2071846]
- power: supply: bq256xx: Handle OOM correctly (Al Stone) [2071846]
- power: supply: fix table problem in sysfs-class-power (Al Stone) [2071846]
- set proper default for Samsung batteries (Al Stone) [2071846]
- power: supply: Fix typo in power_supply_check_supplies (Al Stone) [2071846]
- power: supply: core: Fix boundary conditions in interpolation (Al Stone) [2071846]
- power: supply: core: Initialize struct to zero (Al Stone) [2071846]
- power: supply: Reset err after not finding static battery (Al Stone) [2071846]
- power: supply: Static data for Samsung batteries (Al Stone) [2071846]
- power: supply: Support VBAT-to-Ri lookup tables (Al Stone) [2071846]
- power: supply: ab8500: Standardize BTI resistance (Al Stone) [2071846]
- power: supply: ab8500: Standardize alert mode charging (Al Stone) [2071846]
- power: supply: ab8500: Standardize maintenance charging (Al Stone) [2071846]
- power: supply: Provide stubs for charge_behaviour helpers (Al Stone) [2071846]
- power: supply: core: Add kerneldoc to battery struct (Al Stone) [2071846]
- power: supply: sbs-charger: Don't cancel work that is not initialized (Al Stone) [2071846]
- power: supply: Introduces bypass charging property (Al Stone) [2071846]
- power: supply: core: Use device_property_string_array_count() (Al Stone) [2071846]
- power: supply: core: Simplify hwmon memory allocation (Al Stone) [2071846]
- power: supply: core: Add support for generic fwnodes to power_supply_get_battery_info() (Al Stone) [2071846]
- power: supply: core: Use fwnode_property_*() in power_supply_get_battery_info() (Al Stone) [2071846]
- power: supply: core: Refactor power_supply_set_input_current_limit_from_supplier() (Al Stone) [2071846]
- power: supply: core: fix application of sizeof to pointer (Al Stone) [2071846]
- power: supply: fix charge_behaviour attribute initialization (Al Stone) [2071846]
- power: supply_core: Pass pointer to battery info (Al Stone) [2071846]
- power: supply: add helpers for charge_behaviour sysfs (Al Stone) [2071846]
- power: supply: add charge_behaviour attributes (Al Stone) [2071846]
- power: supply: core: Use library interpolation (Al Stone) [2071846]
- power: supply: core: add POWER_SUPPLY_HEALTH_NO_BATTERY (Al Stone) [2071846]
- power: supply: core: Break capacity loop (Al Stone) [2071846]
- power: supply: core: Move psy_has_property() to fix build (Al Stone) [2071846]
- power: supply: core: Add psy_has_property() (Al Stone) [2071846]
- power: supply: core: Fix parsing of battery chemistry/technology (Al Stone) [2071846]
- power: supply: core: Parse battery chemistry/technology (Al Stone) [2071846]
- power: supply: sbs-battery: add support for time_to_empty_now attribute (Al Stone) [2071846]
- power: supply: sbs-battery: relax voltage limit (Al Stone) [2071846]
Resolves: rhbz#2144641, rhbz#2071846

Signed-off-by: Herton R. Krzesinski <herton@redhat.com>
This commit is contained in:
Herton R. Krzesinski 2023-02-13 22:30:27 +00:00
parent 0b153a0000
commit 33df767009
14 changed files with 79 additions and 9 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 = 2
# #
# Use this spot to avoid future merge conflicts. # Use this spot to avoid future merge conflicts.
# Do not trim this comment. # Do not trim this comment.
RHEL_RELEASE = 266 RHEL_RELEASE = 267
# #
# ZSTREAM # ZSTREAM

1
kernel-aarch64-64k-debug-rhel.config
View File

@ -444,6 +444,7 @@ CONFIG_BAREUDP=m
# CONFIG_BATTERY_MAX17040 is not set # CONFIG_BATTERY_MAX17040 is not set
# CONFIG_BATTERY_MAX17042 is not set # CONFIG_BATTERY_MAX17042 is not set
# CONFIG_BATTERY_RT5033 is not set # CONFIG_BATTERY_RT5033 is not set
# CONFIG_BATTERY_SAMSUNG_SDI is not set
# CONFIG_BATTERY_SBS is not set # CONFIG_BATTERY_SBS is not set
# CONFIG_BCACHE is not set # CONFIG_BCACHE is not set
# CONFIG_BCM54140_PHY is not set # CONFIG_BCM54140_PHY is not set

1
kernel-aarch64-64k-rhel.config
View File

@ -444,6 +444,7 @@ CONFIG_BAREUDP=m
# CONFIG_BATTERY_MAX17040 is not set # CONFIG_BATTERY_MAX17040 is not set
# CONFIG_BATTERY_MAX17042 is not set # CONFIG_BATTERY_MAX17042 is not set
# CONFIG_BATTERY_RT5033 is not set # CONFIG_BATTERY_RT5033 is not set
# CONFIG_BATTERY_SAMSUNG_SDI is not set
# CONFIG_BATTERY_SBS is not set # CONFIG_BATTERY_SBS is not set
# CONFIG_BCACHE is not set # CONFIG_BCACHE is not set
# CONFIG_BCM54140_PHY is not set # CONFIG_BCM54140_PHY is not set

1
kernel-aarch64-debug-rhel.config
View File

@ -441,6 +441,7 @@ CONFIG_BAREUDP=m
# CONFIG_BATTERY_MAX17040 is not set # CONFIG_BATTERY_MAX17040 is not set
# CONFIG_BATTERY_MAX17042 is not set # CONFIG_BATTERY_MAX17042 is not set
# CONFIG_BATTERY_RT5033 is not set # CONFIG_BATTERY_RT5033 is not set
# CONFIG_BATTERY_SAMSUNG_SDI is not set
# CONFIG_BATTERY_SBS is not set # CONFIG_BATTERY_SBS is not set
# CONFIG_BCACHE is not set # CONFIG_BCACHE is not set
# CONFIG_BCM54140_PHY is not set # CONFIG_BCM54140_PHY is not set

1
kernel-aarch64-rhel.config
View File

@ -441,6 +441,7 @@ CONFIG_BAREUDP=m
# CONFIG_BATTERY_MAX17040 is not set # CONFIG_BATTERY_MAX17040 is not set
# CONFIG_BATTERY_MAX17042 is not set # CONFIG_BATTERY_MAX17042 is not set
# CONFIG_BATTERY_RT5033 is not set # CONFIG_BATTERY_RT5033 is not set
# CONFIG_BATTERY_SAMSUNG_SDI is not set
# CONFIG_BATTERY_SBS is not set # CONFIG_BATTERY_SBS is not set
# CONFIG_BCACHE is not set # CONFIG_BCACHE is not set
# CONFIG_BCM54140_PHY is not set # CONFIG_BCM54140_PHY is not set

1
kernel-ppc64le-debug-rhel.config
View File

@ -317,6 +317,7 @@ CONFIG_BAREUDP=m
# CONFIG_BATTERY_MAX17040 is not set # CONFIG_BATTERY_MAX17040 is not set
# CONFIG_BATTERY_MAX17042 is not set # CONFIG_BATTERY_MAX17042 is not set
# CONFIG_BATTERY_RT5033 is not set # CONFIG_BATTERY_RT5033 is not set
# CONFIG_BATTERY_SAMSUNG_SDI is not set
# CONFIG_BATTERY_SBS is not set # CONFIG_BATTERY_SBS is not set
# CONFIG_BCACHE is not set # CONFIG_BCACHE is not set
# CONFIG_BCM54140_PHY is not set # CONFIG_BCM54140_PHY is not set

1
kernel-ppc64le-rhel.config
View File

@ -317,6 +317,7 @@ CONFIG_BAREUDP=m
# CONFIG_BATTERY_MAX17040 is not set # CONFIG_BATTERY_MAX17040 is not set
# CONFIG_BATTERY_MAX17042 is not set # CONFIG_BATTERY_MAX17042 is not set
# CONFIG_BATTERY_RT5033 is not set # CONFIG_BATTERY_RT5033 is not set
# CONFIG_BATTERY_SAMSUNG_SDI is not set
# CONFIG_BATTERY_SBS is not set # CONFIG_BATTERY_SBS is not set
# CONFIG_BCACHE is not set # CONFIG_BCACHE is not set
# CONFIG_BCM54140_PHY is not set # CONFIG_BCM54140_PHY is not set

1
kernel-s390x-debug-rhel.config
View File

@ -317,6 +317,7 @@ CONFIG_BAREUDP=m
# CONFIG_BATTERY_MAX17040 is not set # CONFIG_BATTERY_MAX17040 is not set
# CONFIG_BATTERY_MAX17042 is not set # CONFIG_BATTERY_MAX17042 is not set
# CONFIG_BATTERY_RT5033 is not set # CONFIG_BATTERY_RT5033 is not set
# CONFIG_BATTERY_SAMSUNG_SDI is not set
# CONFIG_BATTERY_SBS is not set # CONFIG_BATTERY_SBS is not set
# CONFIG_BCACHE is not set # CONFIG_BCACHE is not set
# CONFIG_BCM54140_PHY is not set # CONFIG_BCM54140_PHY is not set

1
kernel-s390x-rhel.config
View File

@ -317,6 +317,7 @@ CONFIG_BAREUDP=m
# CONFIG_BATTERY_MAX17040 is not set # CONFIG_BATTERY_MAX17040 is not set
# CONFIG_BATTERY_MAX17042 is not set # CONFIG_BATTERY_MAX17042 is not set
# CONFIG_BATTERY_RT5033 is not set # CONFIG_BATTERY_RT5033 is not set
# CONFIG_BATTERY_SAMSUNG_SDI is not set
# CONFIG_BATTERY_SBS is not set # CONFIG_BATTERY_SBS is not set
# CONFIG_BCACHE is not set # CONFIG_BCACHE is not set
# CONFIG_BCM54140_PHY is not set # CONFIG_BCM54140_PHY is not set

1
kernel-s390x-zfcpdump-rhel.config
View File

@ -321,6 +321,7 @@ CONFIG_BASE_SMALL=0
# CONFIG_BATTERY_MAX17040 is not set # CONFIG_BATTERY_MAX17040 is not set
# CONFIG_BATTERY_MAX17042 is not set # CONFIG_BATTERY_MAX17042 is not set
# CONFIG_BATTERY_RT5033 is not set # CONFIG_BATTERY_RT5033 is not set
# CONFIG_BATTERY_SAMSUNG_SDI is not set
# CONFIG_BATTERY_SBS is not set # CONFIG_BATTERY_SBS is not set
# CONFIG_BCACHE is not set # CONFIG_BCACHE is not set
# CONFIG_BCM54140_PHY is not set # CONFIG_BCM54140_PHY is not set

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

@ -346,6 +346,7 @@ CONFIG_BAREUDP=m
# CONFIG_BATTERY_MAX17040 is not set # CONFIG_BATTERY_MAX17040 is not set
# CONFIG_BATTERY_MAX17042 is not set # CONFIG_BATTERY_MAX17042 is not set
# CONFIG_BATTERY_RT5033 is not set # CONFIG_BATTERY_RT5033 is not set
# CONFIG_BATTERY_SAMSUNG_SDI is not set
# CONFIG_BATTERY_SBS is not set # CONFIG_BATTERY_SBS is not set
# CONFIG_BCACHE is not set # CONFIG_BCACHE is not set
# CONFIG_BCM54140_PHY is not set # CONFIG_BCM54140_PHY is not set

1
kernel-x86_64-rhel.config
View File

@ -346,6 +346,7 @@ CONFIG_BAREUDP=m
# CONFIG_BATTERY_MAX17040 is not set # CONFIG_BATTERY_MAX17040 is not set
# CONFIG_BATTERY_MAX17042 is not set # CONFIG_BATTERY_MAX17042 is not set
# CONFIG_BATTERY_RT5033 is not set # CONFIG_BATTERY_RT5033 is not set
# CONFIG_BATTERY_SAMSUNG_SDI is not set
# CONFIG_BATTERY_SBS is not set # CONFIG_BATTERY_SBS is not set
# CONFIG_BCACHE is not set # CONFIG_BCACHE is not set
# CONFIG_BCM54140_PHY is not set # CONFIG_BCM54140_PHY is not set

69
kernel.spec
View File

@ -143,15 +143,15 @@ Summary: The Linux kernel
# define buildid .local # define buildid .local
%define specversion 5.14.0 %define specversion 5.14.0
%define patchversion 5.14 %define patchversion 5.14
%define pkgrelease 266 %define pkgrelease 267
%define kversion 5 %define kversion 5
%define tarfile_release 5.14.0-266.el9 %define tarfile_release 5.14.0-267.el9
# This is needed to do merge window version magic # This is needed to do merge window version magic
%define patchlevel 14 %define patchlevel 14
# This allows pkg_release to have configurable %%{?dist} tag # This allows pkg_release to have configurable %%{?dist} tag
%define specrelease 266%{?buildid}%{?dist} %define specrelease 267%{?buildid}%{?dist}
# This defines the kabi tarball version # This defines the kabi tarball version
%define kabiversion 5.14.0-266.el9 %define kabiversion 5.14.0-267.el9
# #
# End of genspec.sh variables # End of genspec.sh variables
@ -3208,6 +3208,65 @@ fi
# #
# #
%changelog %changelog
* Mon Feb 13 2023 Herton R. Krzesinski <herton@redhat.com> [5.14.0-267.el9]
- mmc: sdhci-tegra: Issue CMD and DAT resets together (Mark Salter) [2144641]
- mmc: sdhci-tegra: Add support to program MC stream ID (Mark Salter) [2144641]
- iommu/tegra: Add tegra_dev_iommu_get_stream_id() helper (Mark Salter) [2144641]
- mmc: sdhci-tegra: Sort includes alphabetically (Mark Salter) [2144641]
- mmc: sdhci-tegra: Separate Tegra194 and Tegra234 SoC data (Mark Salter) [2144641]
- mmc: sdhci: Centralize CMD and DATA reset handling (Mark Salter) [2144641]
- mmc: sdhci: Get rid of SDHCI_QUIRK_RESET_CMD_DATA_ON_IOS (Mark Salter) [2144641]
- mmc: sdhci: Remove misleading comment about resets (Mark Salter) [2144641]
- mmc: sdhci: Separate out sdhci_reset_for_all() (Mark Salter) [2144641]
- mmc: sdhci: Fix ADMA for PAGE_SIZE >= 64KiB (Mark Salter) [2144641]
- mmc: sdhci-pci: Remove dead code (rst_n_gpio et al) (Mark Salter) [2144641]
- mmc: sdhci-pci: Remove dead code (cd_gpio, cd_irq et al) (Mark Salter) [2144641]
- mmc: sdhci: Remove unused prototype declaration in the header (Mark Salter) [2144641]
- mmc: sdhci: Deduplicate sdhci_get_cd_nogpio() (Mark Salter) [2144641]
- mmc: sdhci-pci: Read card detect from ACPI for Intel Merrifield (Mark Salter) [2144641]
- mmc: sdhci: Return true only when timeout exceeds capacity of the HW timer (Mark Salter) [2144641]
- mmc: sdhci: Change the code to check auto_cmd23 (Mark Salter) [2144641]
- mmc: sdhci: Map more voltage level to SDHCI_POWER_330 (Mark Salter) [2144641]
- mmc: sdhci: Correct the tuning command handle for PIO mode (Mark Salter) [2144641]
- mmc: sdhci: Fix issue with uninitialized dma_slave_config (Mark Salter) [2144641]
- mmc: sdhci: Introduce max_timeout_count variable in sdhci_host (Mark Salter) [2144641]
- power: supply: samsung-sdi-battery: Add missing charge restart voltages (Al Stone) [2071846]
- power: supply: bq256xx: Handle OOM correctly (Al Stone) [2071846]
- power: supply: fix table problem in sysfs-class-power (Al Stone) [2071846]
- set proper default for Samsung batteries (Al Stone) [2071846]
- power: supply: Fix typo in power_supply_check_supplies (Al Stone) [2071846]
- power: supply: core: Fix boundary conditions in interpolation (Al Stone) [2071846]
- power: supply: core: Initialize struct to zero (Al Stone) [2071846]
- power: supply: Reset err after not finding static battery (Al Stone) [2071846]
- power: supply: Static data for Samsung batteries (Al Stone) [2071846]
- power: supply: Support VBAT-to-Ri lookup tables (Al Stone) [2071846]
- power: supply: ab8500: Standardize BTI resistance (Al Stone) [2071846]
- power: supply: ab8500: Standardize alert mode charging (Al Stone) [2071846]
- power: supply: ab8500: Standardize maintenance charging (Al Stone) [2071846]
- power: supply: Provide stubs for charge_behaviour helpers (Al Stone) [2071846]
- power: supply: core: Add kerneldoc to battery struct (Al Stone) [2071846]
- power: supply: sbs-charger: Don't cancel work that is not initialized (Al Stone) [2071846]
- power: supply: Introduces bypass charging property (Al Stone) [2071846]
- power: supply: core: Use device_property_string_array_count() (Al Stone) [2071846]
- power: supply: core: Simplify hwmon memory allocation (Al Stone) [2071846]
- power: supply: core: Add support for generic fwnodes to power_supply_get_battery_info() (Al Stone) [2071846]
- power: supply: core: Use fwnode_property_*() in power_supply_get_battery_info() (Al Stone) [2071846]
- power: supply: core: Refactor power_supply_set_input_current_limit_from_supplier() (Al Stone) [2071846]
- power: supply: core: fix application of sizeof to pointer (Al Stone) [2071846]
- power: supply: fix charge_behaviour attribute initialization (Al Stone) [2071846]
- power: supply_core: Pass pointer to battery info (Al Stone) [2071846]
- power: supply: add helpers for charge_behaviour sysfs (Al Stone) [2071846]
- power: supply: add charge_behaviour attributes (Al Stone) [2071846]
- power: supply: core: Use library interpolation (Al Stone) [2071846]
- power: supply: core: add POWER_SUPPLY_HEALTH_NO_BATTERY (Al Stone) [2071846]
- power: supply: core: Break capacity loop (Al Stone) [2071846]
- power: supply: core: Move psy_has_property() to fix build (Al Stone) [2071846]
- power: supply: core: Add psy_has_property() (Al Stone) [2071846]
- power: supply: core: Fix parsing of battery chemistry/technology (Al Stone) [2071846]
- power: supply: core: Parse battery chemistry/technology (Al Stone) [2071846]
- power: supply: sbs-battery: add support for time_to_empty_now attribute (Al Stone) [2071846]
- power: supply: sbs-battery: relax voltage limit (Al Stone) [2071846]
* Mon Feb 13 2023 Herton R. Krzesinski <herton@redhat.com> [5.14.0-266.el9] * Mon Feb 13 2023 Herton R. Krzesinski <herton@redhat.com> [5.14.0-266.el9]
- crypto: jitter - consider 32 LSB for APT (Vladis Dronov) [2164067] - crypto: jitter - consider 32 LSB for APT (Vladis Dronov) [2164067]
- xhci-pci: Set runtime PM as default policy on all xHC 1.2 or later devices (Torez Smith) [2130063 2139486] - xhci-pci: Set runtime PM as default policy on all xHC 1.2 or later devices (Torez Smith) [2130063 2139486]
@ -3256,7 +3315,7 @@ fi
- perf/x86/intel/uncore: Introduce UPI topology type (Michael Petlan) [2154045] - perf/x86/intel/uncore: Introduce UPI topology type (Michael Petlan) [2154045]
- perf/x86/intel/uncore: Generalize IIO topology support (Michael Petlan) [2154045] - perf/x86/intel/uncore: Generalize IIO topology support (Michael Petlan) [2154045]
- perf vendor events power10: Fix hv-24x7 metric events (Mamatha Inamdar) [2149193] - perf vendor events power10: Fix hv-24x7 metric events (Mamatha Inamdar) [2149193]
- Add taint flag for partner supported GPL modules Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2038999 Upstream Status: RHEL-only (Alice Mitchell) - Add taint flag for partner supported GPL modules (Alice Mitchell) [2038999]
* Thu Feb 09 2023 Herton R. Krzesinski <herton@redhat.com> [5.14.0-265.el9] * Thu Feb 09 2023 Herton R. Krzesinski <herton@redhat.com> [5.14.0-265.el9]
- CI: Add pipelines for kernel-64k variant for RHEL (Veronika Kabatova) - CI: Add pipelines for kernel-64k variant for RHEL (Veronika Kabatova)

6
sources
View File

@ -1,3 +1,3 @@
SHA512 (linux-5.14.0-266.el9.tar.xz) = 23f30428e85883f8ecebf30332697b0059da8c6da36dc8c48efa355d890d08fac694a280783766bcb93f90aac113a6d62e700c8eff86de0225cf6cc6a07c48bf SHA512 (linux-5.14.0-267.el9.tar.xz) = 42a78581ed6231f85063ce4fe89532cd2d196af2a8de2062b09b844f3e67215e9d49edbc90b0e03466e12d270df605c10a0a13f5db8f804fbde2b0b3f6901a46
SHA512 (kernel-abi-stablelists-5.14.0-266.el9.tar.bz2) = 061cfb1d44690312288fa22d7bfd3fe8908d0bdd882b1db80014ca2bf7d54eda4bd6a5980c97150bee94f8e8a788b3d470c7e462b5b3263975ec6f300b387de7 SHA512 (kernel-abi-stablelists-5.14.0-267.el9.tar.bz2) = 7606cb77076f2980977f5c15540f7f357a2a6f26af4eb129c8113e184dd2578d7e121226e09619124f9531c3a1053b1230cef024b851a535e4f805db30e6e8b4
SHA512 (kernel-kabi-dw-5.14.0-266.el9.tar.bz2) = 9eadcc745f0c2ff96938db1d23e6f8f7ab5a55465352212a542228877c541548b58827e8ae52de635767fa945dd6331ed5393319bfb131f4ec39454032a5c439 SHA512 (kernel-kabi-dw-5.14.0-267.el9.tar.bz2) = 90b2c60d8f5f373b6874145f0fd77ce3903832eba36694871ce5d90e53cae87c6fe5f488c065d24e89b7881ce27bb33350256a78211ad89beeee54ea3e56651e