From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 26 Sep 2021 19:11:58 +0000 (-0700)
Subject: Merge tag 'thermal-v5.15-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/therma... 
X-Git-Tag: iomap-folio-5.17-old~470
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=299d6e47e8f8665904b9c8c321edb3876c92f68b;p=users%2Fwilly%2Flinux.git

Merge tag 'thermal-v5.15-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux

Pull thermal fixes from Daniel Lezcano:

 - Fix thermal shutdown after a suspend/resume due to a wrong TCC value
   restored on Intel platform (Antoine Tenart)

 - Fix potential buffer overflow when building the list of policies. The
   buffer size is not updated after writing to it (Dan Carpenter)

 - Fix wrong check against IS_ERR instead of NULL (Ansuel Smith)

* tag 'thermal-v5.15-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux:
  thermal/drivers/tsens: Fix wrong check for tzd in irq handlers
  thermal/core: Potential buffer overflow in thermal_build_list_of_policies()
  thermal/drivers/int340x: Do not set a wrong tcc offset on resume
---

299d6e47e8f8665904b9c8c321edb3876c92f68b