Merge branches 'thermal-core' and 'thermal-tools'

Browse source

Merge additional changes in the thermal core and thermal tools updates
for 5.20-rc1:

 - Fix NULL poiter dereference in the thermal sysfs interface that
   results from an error code path mishandling (Rafael Wysocki).

 - Drop COMPILE_TEST dependency that's not needed any more from two
   thermal Kconfig entries (Jean Delvare).

 - Fix possible path truncations in the tmon utility (Florian Fainelli).

* thermal-core:
  thermal: Drop obsolete dependency on COMPILE_TEST
  thermal: sysfs: Fix cooling_device_stats_setup() error code path

* thermal-tools:
  tools/thermal: Fix possible path truncations

...

This commit is contained in:

Rafael J. Wysocki 2022-08-08 19:39:09 +02:00

parent 312c1a44da 8df4ef3eaa 6c58cf40e3

commit 7f0169cde0

3 changed files with 22 additions and 16 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

4

drivers/thermal/Kconfig

View file

10

drivers/thermal/thermal_sysfs.c

View file

24

tools/thermal/tmon/sysfs.c

View file