]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branches 'thermal-core' and 'thermal-tools'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 8 Aug 2022 17:39:09 +0000 (19:39 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 8 Aug 2022 17:39:09 +0000 (19:39 +0200)
commitdc77ba3b8f0639f10923da312382d9777b7ef14a
treeba53b18142a8497b80d937e7099f47ef32c53268
parentf3fd78d8b483887ac83b4a7bde1069c7bbec48a3
parent480edf2ebe83175228d042e8db6bccebfc04af45
parent5f2efafeb9182ae97b155a6aecba418c8020f7aa
Merge branches 'thermal-core' and 'thermal-tools'

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