summaryrefslogtreecommitdiff
path: root/include/linux/nmi.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2017-09-28 14:35:51 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2017-09-28 14:35:51 -0700
commit74de8187ff46bfc24fcb1533791515e46b256116 (patch)
tree787c5b451dc6dffdcbf2a7ab000e848f0feb0b26 /include/linux/nmi.h
parent02a2b05395dde2f49e7777b67b51a5fbc6606943 (diff)
parentabeb19a219dce5c021c759d01434f82924354df7 (diff)
Merge tag 'pm-4.14-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull power management fixes from Rafael Wysocki: "These fix a deadlock in the operating performance points (OPP) framework introduced during the 4.11 cycle, more issues with duplicate device objects for cpufreq-dt and cpufreq documentation. Specifics: - Fix a deadlock in the operating performance points (OPP) framework caused by a notifier callback taking a lock that's already held by its caller (Viresh Kumar). - Prevent the ti-cpufreq and cpufreq-dt-platdev drivers from attempting to register conflicting device objects which triggers a warning from sysfs (Suniel Mahesh). - Drop a stale reference to a piece of intel_pstate documentation that's not in the tree any more (Rafael Wysocki)" * tag 'pm-4.14-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: cpufreq: docs: Drop intel-pstate.txt from index.txt cpufreq: dt: Fix sysfs duplicate filename creation for platform-device PM / OPP: Call notifier without holding opp_table->lock
Diffstat (limited to 'include/linux/nmi.h')
0 files changed, 0 insertions, 0 deletions