]> git.proxmox.com Git - mirror_ubuntu-impish-kernel.git/commit
Merge tag 'thermal-v5.13-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/therma...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 29 May 2021 16:55:55 +0000 (06:55 -1000)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 29 May 2021 16:55:55 +0000 (06:55 -1000)
commitdf8c66c4cfb91f2372d138b9b714f6df6f506966
tree51ccabd24de86b385b0a782a913331d1612ffd05
parentf956cb99b938fbf0f8262ba335d505b1ffd02c4e
parent5d8db38ad7660e4d78f4e2a63f14336f31f07a63
Merge tag 'thermal-v5.13-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux

Pull thermal fixes from Daniel Lezcano:

 - Fix uninitialized error code value for the SPMI adc driver (Yang
   Yingliang)

 - Fix kernel doc warning (Yang Li)

 - Fix wrong read-write thermal trip point initialization (Srinivas
   Pandruvada)

* tag 'thermal-v5.13-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux:
  thermal/drivers/qcom: Fix error code in adc_tm5_get_dt_channel_data()
  thermal/ti-soc-thermal: Fix kernel-doc
  thermal/drivers/intel: Initialize RW trip to THERMAL_TEMP_INVALID