From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 30 Mar 2017 02:59:49 +0000 (-0700)
Subject: Merge branch 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux
X-Git-Tag: v4.14-rc1~1218
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=89970a04d70c6c9e5e4492fd4096c0b5630a478c;p=platform%2Fkernel%2Flinux-rpi.git

Merge branch 'for-rc' of git://git./linux/kernel/git/rzhang/linux

Pull thermal management fixes from Zhang Rui:

 - Fix a potential deadlock in cpu_cooling driver, which was introduced
   in 4.11-rc1. (Matthew Wilcox)

 - Fix the cpu_cooling and devfreq_cooling code to handle possible error
   return value from OPP calls, together with three minor fixes in the
   same patch series. (Viresh Kumar)

* 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux:
  thermal: cpu_cooling: Check OPP for errors
  thermal: cpu_cooling: Replace dev_warn with dev_err
  thermal: devfreq: Check OPP for errors
  thermal: devfreq_cooling: Replace dev_warn with dev_err
  thermal: devfreq: Simplify expression
  thermal: Fix potential deadlock in cpu_cooling
---

89970a04d70c6c9e5e4492fd4096c0b5630a478c