From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Mon, 24 Mar 2025 13:09:38 +0000 (+0100)
Subject: Merge branches 'thermal-core' and 'thermal-misc'
X-Git-Tag: v6.15-rc1~190^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c3b659b74541f4564f9f5a39f65e625c47e77e21;p=thirdparty%2Fkernel%2Flinux.git

Merge branches 'thermal-core' and 'thermal-misc'

Merge thermal core updates and miscellaneous updates of the thermal
control subsystem for 6.15-rc1:

 - Delay exposing thermal zone sysfs interface to prevent user space
   from accessing thermal zones that have not been completely
   initialized yet (Lucas De Marchi).

 - Fix a spelling mistake in a comment in the thermal core (Colin Ian
   King).

 - Use kcalloc() instead of kzalloc() in some places in the thermal
   control subsystem (Lukasz Luba, Ethan Carter Edwards).

 - Clean up variable initialization in int340x_thermal_zone_add()
   (Christophe JAILLET).

* thermal-core:
  thermal: core: Delay exposing sysfs interface
  thermal: core: Fix spelling mistake "Occurences" -> "Occurrences"

* thermal-misc:
  thermal: intel: Clean up zone_trips[] initialization in int340x_thermal_zone_add()
  thermal: hisi: Use kcalloc() instead of kzalloc() with multiplication
  thermal: int340x: Use kcalloc() instead of kzalloc() with multiplication
  thermal: k3_j72xx_bandgap: Use kcalloc() instead of kzalloc()
  thermal/of: Use kcalloc() instead of kzalloc() with multiplication
  thermal/debugfs: replace kzalloc() with kcalloc() in thermal_debug_tz_add()
---

c3b659b74541f4564f9f5a39f65e625c47e77e21