diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2017-01-27 10:22:00 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-01-27 10:22:00 -0800 |
| commit | ed4d50c42d67769138b49de7dc672b76c88ee1c8 (patch) | |
| tree | d4816927280948e77d63f7c2b140fedc21a88c60 /tools/perf/util/scripting-engines/trace-event-python.c | |
| parent | Merge tag 'drm-fixes-for-v4.10-rc6-part-two' of git://people.freedesktop.org/~airlied/linux (diff) | |
| parent | Revert "thermal: thermal_hwmon: Convert to hwmon_device_register_with_info()" (diff) | |
| download | wireguard-linux-ed4d50c42d67769138b49de7dc672b76c88ee1c8.tar.xz wireguard-linux-ed4d50c42d67769138b49de7dc672b76c88ee1c8.zip | |
Merge branch 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux
Pull thermal management fix from Zhang Rui:
"A single revert from a recently introduced problem.
Specifics:
Commit 7611fb68062f ("thermal: thermal_hwmon: Convert to
hwmon_device_register_with_info()"), which was introduced in 4.10-rc5,
uses new hwmon API. But this breaks some soc thermal driver because
the new hwmon API has a strict rule for the hwmon device name. Revert
the offending commit as a quick solution for 4.10"
* 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux:
Revert "thermal: thermal_hwmon: Convert to hwmon_device_register_with_info()"
Diffstat (limited to 'tools/perf/util/scripting-engines/trace-event-python.c')
0 files changed, 0 insertions, 0 deletions