Merge branches 'thermal-core' and 'thermal-intel' into linux-next

* thermal-core:
  thermal: core: Use strnlen() in thermal_zone_device_register_with_trips()

* thermal-intel:
  thermal: intel: int340x: Use sysfs_emit{_at}() in sysfs show functions
  thermal: intel: selftests: workload_hint: Support slow workload hints
  thermal: int340x: processor_thermal: Enable slow workload type hints
  thermal: intel: intel_pch_thermal: Drop explicit driver data clearing