Merge tag 'thermal-v5.12-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/therma...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 17 Mar 2021 19:27:37 +0000 (12:27 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 17 Mar 2021 19:27:37 +0000 (12:27 -0700)
commit35d8c39d0e52f5230716f61910881b309e4b1a04
treed6e764fd610407b893ebf463a2a71ce5e7a70a97
parent1df27313f50a57497c1faeb6a6ae4ca939c85a7d
parent2046a24ae121cd107929655a6aaf3b8c5beea01f
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