[GIT PULL] Thermal control fixes for v5.18-rc5

From: Rafael J. Wysocki
Date: Thu Apr 28 2022 - 11:34:05 EST


Hi Linus,

Please pull from the tag

git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git \
thermal-5.18-rc5

with top-most commit a12475f91b69cce067e5de905fafa893ae12c3ae

Merge branch 'thermal-int340x'

on top of commit b2d229d4ddb17db541098b83524d901257e93845

Linux 5.18-rc3

to receive thermal control fixes for 5.18-rc5.

These take back recent chages that started to confuse users and
fix up an attr.show callback prototype in a driver.

Specifics:

- Stop warning about deprecation of the userspace thermal governor
and cooling device status interface, because there are cases in
which user space has to drive thermal management with the help
of them (Daniel Lezcano).

- Fix attr.show callback prototype in the int340x thermal driver (Kees
Cook).

Thanks!


---------------

Daniel Lezcano (2):
Revert "thermal/core: Deprecate changing cooling device state
from userspace"
thermal/governor: Remove deprecated information

Kees Cook (1):
thermal: int340x: Fix attr.show callback prototype

---------------

drivers/thermal/Kconfig | 6 ++++--
drivers/thermal/gov_user_space.c | 3 +--
drivers/thermal/intel/int340x_thermal/int3400_thermal.c | 4 ++--
drivers/thermal/thermal_sysfs.c | 3 ---
4 files changed, 7 insertions(+), 9 deletions(-)