Merge: Update drivers/thermal/intel, include thermal_of fix
MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9/-/merge_requests/6390 JIRA: https://issues.redhat.com/browse/RHEL-79821 The following upstream commits were not applied due to scope: 66bc1a173328 treewide: Use sysfs_bin_attr_simple_read() helper 4a62d588a84e thermal: core: Eliminate writable trip points masks dd64594ca2c5 thermal: Switch back to struct platform_driver::remove() cdd30ebb1b9f module: Convert symbol namespace to string literal Upstream commit 423de5b5bc5b is included in this patchset as it provides a fix for upstream 94c6110b0b13 which was included in a recent update to drivers/thermal Signed-off-by:David Arcari <darcari@redhat.com> Approved-by:
Steve Best <sbest@redhat.com> Approved-by:
Tony Camuso <tcamuso@redhat.com> Approved-by:
CKI KWF Bot <cki-ci-bot+kwf-gitlab-com@redhat.com> Merged-by:
Augusto Caringi <acaringi@redhat.com>
No related branches found
No related tags found
Showing
- arch/x86/include/asm/intel-family.h 0 additions, 1 deletionarch/x86/include/asm/intel-family.h
- arch/x86/include/asm/topology.h 0 additions, 5 deletionsarch/x86/include/asm/topology.h
- arch/x86/platform/efi/quirks.c 1 addition, 2 deletionsarch/x86/platform/efi/quirks.c
- arch/x86/platform/intel-quark/imr.c 1 addition, 1 deletionarch/x86/platform/intel-quark/imr.c
- arch/x86/platform/intel-quark/imr_selftest.c 1 addition, 1 deletionarch/x86/platform/intel-quark/imr_selftest.c
- drivers/acpi/dptf/dptf_pch_fivr.c 1 addition, 0 deletionsdrivers/acpi/dptf/dptf_pch_fivr.c
- drivers/acpi/dptf/dptf_power.c 2 additions, 0 deletionsdrivers/acpi/dptf/dptf_power.c
- drivers/acpi/dptf/int340x_thermal.c 6 additions, 0 deletionsdrivers/acpi/dptf/int340x_thermal.c
- drivers/acpi/fan.h 1 addition, 0 deletionsdrivers/acpi/fan.h
- drivers/thermal/intel/Kconfig 2 additions, 2 deletionsdrivers/thermal/intel/Kconfig
- drivers/thermal/intel/int340x_thermal/Kconfig 2 additions, 2 deletionsdrivers/thermal/intel/int340x_thermal/Kconfig
- drivers/thermal/intel/int340x_thermal/acpi_thermal_rel.c 0 additions, 1 deletiondrivers/thermal/intel/int340x_thermal/acpi_thermal_rel.c
- drivers/thermal/intel/int340x_thermal/int3400_thermal.c 5 additions, 15 deletionsdrivers/thermal/intel/int340x_thermal/int3400_thermal.c
- drivers/thermal/intel/int340x_thermal/int3403_thermal.c 1 addition, 0 deletionsdrivers/thermal/intel/int340x_thermal/int3403_thermal.c
- drivers/thermal/intel/int340x_thermal/int340x_thermal_zone.c 0 additions, 1 deletiondrivers/thermal/intel/int340x_thermal/int340x_thermal_zone.c
- drivers/thermal/intel/int340x_thermal/processor_thermal_device.h 1 addition, 0 deletions.../thermal/intel/int340x_thermal/processor_thermal_device.h
- drivers/thermal/intel/int340x_thermal/processor_thermal_device_pci.c 3 additions, 1 deletion...rmal/intel/int340x_thermal/processor_thermal_device_pci.c
- drivers/thermal/intel/int340x_thermal/processor_thermal_rapl.c 24 additions, 46 deletions...rs/thermal/intel/int340x_thermal/processor_thermal_rapl.c
- drivers/thermal/intel/intel_pch_thermal.c 5 additions, 0 deletionsdrivers/thermal/intel/intel_pch_thermal.c
- drivers/thermal/intel/intel_powerclamp.c 1 addition, 1 deletiondrivers/thermal/intel/intel_powerclamp.c
Loading
Please register or sign in to comment