summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2022-08-08 20:39:09 +0300
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2022-08-08 20:39:09 +0300
commit7f0169cde0ced2e2b7bdf3dcedcf8c71efc6afc0 (patch)
treeba53b18142a8497b80d937e7099f47ef32c53268 /drivers
parent312c1a44da370a367b643fae63107211104a1464 (diff)
parent8df4ef3eaa62b25afbb30cc7707cc99ec155ed71 (diff)
parent6c58cf40e3a1d2f47c09d3489857e9476316788a (diff)
downloadlinux-7f0169cde0ced2e2b7bdf3dcedcf8c71efc6afc0.tar.xz
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