summaryrefslogtreecommitdiffstats
path: root/drivers/watchdog
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2021-03-05 12:36:33 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2021-03-05 12:36:33 -0800
commit6d47254c063426541e7134fc5632243356ee74b1 (patch)
treeb6236ea64c9175687c3944e898c3603c452dc173 /drivers/watchdog
parentea6be461cbedefaa881711a43f2842aabbd12fd4 (diff)
parent7bff4c26b6d2c82bebf8630f31b1cca11b1bd562 (diff)
downloadlinux-6d47254c063426541e7134fc5632243356ee74b1.tar.bz2
Merge tag 'pm-5.12-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull power management fixes from Rafael Wysocki: "These fix the usage of device links in the runtime PM core code and update the DTPM (Dynamic Thermal Power Management) feature added recently. Specifics: - Make the runtime PM core code avoid attempting to suspend supplier devices before updating the PM-runtime status of a consumer to 'suspended' (Rafael Wysocki). - Fix DTPM (Dynamic Thermal Power Management) root node initialization and label that feature as EXPERIMENTAL in Kconfig (Daniel Lezcano)" * tag 'pm-5.12-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: powercap/drivers/dtpm: Add the experimental label to the option description powercap/drivers/dtpm: Fix root node initialization PM: runtime: Update device status before letting suppliers suspend
Diffstat (limited to 'drivers/watchdog')
0 files changed, 0 insertions, 0 deletions