From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 12 May 2018 17:58:57 +0000 (-0700)
Subject: Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux
X-Git-Tag: v4.17-rc5~6
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=427fbe89261d8f11cd20b5a4ba94e977061f69d6;p=linux-2.6-block.git

Merge branch 'next' of git://git./linux/kernel/git/rzhang/linux

Pull thermal fixes from Zhang Rui:

 - fix NULL pointer dereference on module load/probe for int3403_thermal
   driver

 - fix an emergency shutdown issue on exynos thermal driver

* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux:
  thermal: exynos: Propagate error value from tmu_read()
  thermal: exynos: Reading temperature makes sense only when TMU is turned on
  thermal: int3403_thermal: Fix NULL pointer deref on module load / probe
---

427fbe89261d8f11cd20b5a4ba94e977061f69d6