Merge branch 'acpi-thermal'

Merge ACPI thermal zone driver updates for 6.8-rc1:

 - Use generic ACPI helpers for evaluating trip point temperature
   objects in the ACPI thermal zone driver (Rafael J. Wysockii, Arnd
   Bergmann).

 - Add Thermal fast Sampling Period (_TFP) support to the ACPI thermal
   zone driver (Jeff Brasen).

* acpi-thermal:
  ACPI: thermal_lib: include "internal.h" for function prototypes
  ACPI: thermal: Add Thermal fast Sampling Period (_TFP) support
  ACPI: thermal: Use library functions to obtain trip point temperature values
  ACPI: thermal_lib: Add functions returning temperature in deci-Kelvin
  thermal: ACPI: Move the ACPI thermal library to drivers/acpi/

diff --cc drivers/acpi/Makefile
Simple merge

diff --cc drivers/acpi/internal.h
index 266aad006fe4a9bb976d919075c5868d5c3c220f,a3728f70a79547e42a6581304c326758c89b6331..6588525c45efaa3b620d3f8bf6dc031932f43234
--- 1/drivers/acpi/internal.h
--- 2/drivers/acpi/internal.h
+++ b/drivers/acpi/internal.h
@@@ -85,15 -85,11 +85,20 @@@ bool acpi_scan_is_offline(struct acpi_d
  acpi_status acpi_sysfs_table_handler(u32 event, void *table, void *context);
  void acpi_scan_table_notify(void);
  
+ int acpi_active_trip_temp(struct acpi_device *adev, int id, int *ret_temp);
+ int acpi_passive_trip_temp(struct acpi_device *adev, int *ret_temp);
+ int acpi_hot_trip_temp(struct acpi_device *adev, int *ret_temp);
+ int acpi_critical_trip_temp(struct acpi_device *adev, int *ret_temp);
+ 
 +#ifdef CONFIG_ARM64
 +int acpi_arch_thermal_cpufreq_pctg(void);
 +#else
 +static inline int acpi_arch_thermal_cpufreq_pctg(void)
 +{
 +      return 0;
 +}
 +#endif
 +
  /* --------------------------------------------------------------------------
                       Device Node Initialization / Removal
     -------------------------------------------------------------------------- */

diff --cc drivers/acpi/thermal.c
Simple merge

diff --cc include/linux/acpi.h
Simple merge