From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 17 Mar 2021 19:27:37 +0000 (-0700)
Subject: Merge tag 'thermal-v5.12-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/therma... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=35d8c39d0e52f5230716f61910881b309e4b1a04;p=linux.git

Merge tag 'thermal-v5.12-rc4' of git://git./linux/kernel/git/thermal/linux

Pull thermal framework fix from Daniel Lezcano:
 "Fix NULL pointer access when the cooling device transition stats
  table failed to allocate due to a big number of states (Manaf
  Meethalavalappu Pallikunhi)"

* tag 'thermal-v5.12-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux:
  thermal/core: Add NULL pointer check before using cooling device stats
---

35d8c39d0e52f5230716f61910881b309e4b1a04