]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commit - block/blk-map.c
Merge tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 29 Dec 2017 07:14:47 +0000 (23:14 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 29 Dec 2017 07:14:47 +0000 (23:14 -0800)
commitc0208a33cbc428f66b446f5dd16c91fb76aaab88
tree725bd471b26195ce67e19740f28b853500c5d7c4
parent4f2382f380dec67f795ccde0f3b2e3fa686a4bbc
parent756efe131088b6e6e7f0124ff9c4e1f0165d3140
Merge tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux

Pull clk fix from Stephen Boyd:
 "One more fix for the runtime PM clk patches. We're calling a runtime
  PM API that may schedule from somewhere that we can't do that. We
  change to the async version of pm_runtime_put() to fix it"

* tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux:
  clk: use atomic runtime pm api in clk_core_is_enabled