From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 23 Jan 2019 03:23:41 +0000 (+1300)
Subject: Merge branch 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux
X-Git-Tag: v5.0-rc4~30
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=333478a7eb21245880c89aad166ad08478cc577d;p=thirdparty%2Flinux.git

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

Pull thermal management fixes from Zhang Rui:

 - Fix a race condition that sysfs could be accessed before necessary
   initialization in int340x thermal driver. (Aaron Hill)

 - Fix a NULL vs IS_ERR() check in int340x thermal driver. (Dan
   Carpenter)

* 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux:
  drivers: thermal: int340x_thermal: Fix sysfs race condition
  thermal: int340x_thermal: Fix a NULL vs IS_ERR() check
---

333478a7eb21245880c89aad166ad08478cc577d