Commit 3f2ca7b8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'thermal-6.14-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm 

Pull thermal control fixes from Rafael Wysocki:
 "Fix a regression caused by an inadvertent change of the
  THERMAL_GENL_ATTR_CPU_CAPABILITY value in one of the recent thermal
  commits (Zhang Rui) and drop a stale piece of documentation (Daniel
  Lezcano)"

* tag 'thermal-6.14-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  thermal/cpufreq_cooling: Remove structure member documentation
  thermal/netlink: Prevent userspace segmentation fault by adjusting UAPI header
parents f92a80bd a6768c4f

drivers/thermal/cpufreq_cooling.c

+0 −2
Original line number Diff line number Diff line
@@ -57,8 +57,6 @@ struct time_in_idle { 
 * @max_level: maximum cooling level. One less than total number of valid

 *	cpufreq frequencies.

 * @em: Reference on the Energy Model of the device

 * @cdev: thermal_cooling_device pointer to keep track of the

 *	registered cooling device.

 * @policy: cpufreq policy.

 * @cooling_ops: cpufreq callbacks to thermal cooling device ops

 * @idle_time: idle time stats

include/uapi/linux/thermal.h

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ enum thermal_genl_attr { 
	THERMAL_GENL_ATTR_TZ,

	THERMAL_GENL_ATTR_TZ_ID,

	THERMAL_GENL_ATTR_TZ_TEMP,

	THERMAL_GENL_ATTR_TZ_PREV_TEMP,

	THERMAL_GENL_ATTR_TZ_TRIP,

	THERMAL_GENL_ATTR_TZ_TRIP_ID,

	THERMAL_GENL_ATTR_TZ_TRIP_TYPE,
@@ -54,6 +53,7 @@ enum thermal_genl_attr { 
	THERMAL_GENL_ATTR_THRESHOLD,

	THERMAL_GENL_ATTR_THRESHOLD_TEMP,

	THERMAL_GENL_ATTR_THRESHOLD_DIRECTION,

	THERMAL_GENL_ATTR_TZ_PREV_TEMP,

	__THERMAL_GENL_ATTR_MAX,

};

#define THERMAL_GENL_ATTR_MAX (__THERMAL_GENL_ATTR_MAX - 1)