History

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

Linus Torvalds committed 1 year ago

Commit 3f2ca7b2 parents f92a80b a6768c42 files · +1 −3Browse files

Showing the changes to include/uapi/linux (1 of 2 files). Show all

Unified · Split

include/uapi/linux/thermal.h+1−1
@@ -30,7 +30,6 @@ enum thermal_genl_attr { · 29 unmodified lines
30 THERMAL_GENL_ATTR_TZ,30 THERMAL_GENL_ATTR_TZ,
31 THERMAL_GENL_ATTR_TZ_ID,31 THERMAL_GENL_ATTR_TZ_ID,
32 THERMAL_GENL_ATTR_TZ_TEMP,32 THERMAL_GENL_ATTR_TZ_TEMP,
33 THERMAL_GENL_ATTR_TZ_PREV_TEMP,
34 THERMAL_GENL_ATTR_TZ_TRIP,33 THERMAL_GENL_ATTR_TZ_TRIP,
35 THERMAL_GENL_ATTR_TZ_TRIP_ID,34 THERMAL_GENL_ATTR_TZ_TRIP_ID,
36 THERMAL_GENL_ATTR_TZ_TRIP_TYPE,35 THERMAL_GENL_ATTR_TZ_TRIP_TYPE,
@@ -54,6 +53,7 @@ enum thermal_genl_attr { · 17 unmodified lines
54 THERMAL_GENL_ATTR_THRESHOLD,53 THERMAL_GENL_ATTR_THRESHOLD,
55 THERMAL_GENL_ATTR_THRESHOLD_TEMP,54 THERMAL_GENL_ATTR_THRESHOLD_TEMP,
56 THERMAL_GENL_ATTR_THRESHOLD_DIRECTION,55 THERMAL_GENL_ATTR_THRESHOLD_DIRECTION,
56 THERMAL_GENL_ATTR_TZ_PREV_TEMP,
57 __THERMAL_GENL_ATTR_MAX,57 __THERMAL_GENL_ATTR_MAX,
58};58};
59#define THERMAL_GENL_ATTR_MAX (__THERMAL_GENL_ATTR_MAX - 1)59#define THERMAL_GENL_ATTR_MAX (__THERMAL_GENL_ATTR_MAX - 1)