Linux / linux / 9fc13bb / Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux

Linux/linux 9fc13bb — drivers/thermal mtk_thermal.c cpu_cooling.c, drivers/thermal/broadcom bcm2835_thermal.c

2019-03-24 17:01:53 UTC by Linus Torvalds on ⎇

master

Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux

Pull thermal management fixes from Zhang Rui:

 - Fix a wrong __percpu structure declaration in intel_powerclamp driver
   (Luc Van Oostenryck)

 - Fix truncated name of the idle injection kthreads created by
   intel_powerclamp driver (Zhang Rui)

 - Fix the missing UUID supports in int3400 thermal driver (Matthew
   Garrett)

 - Fix a crash when accessing the debugfs of bcm2835 SoC thermal driver
   (Phil Elwell)

 - A couple of trivial fixes/cleanups in some SoC thermal drivers

* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux:
  thermal/intel_powerclamp: fix truncated kthread name
  thermal: mtk: Allocate enough space for mtk_thermal.
  thermal/int340x_thermal: fix mode setting
  thermal/int340x_thermal: Add additional UUIDs
  thermal: cpu_cooling: Remove unused cur_freq variable
  thermal: bcm2835: Fix crash in bcm2835_thermal_debugfs
  thermal: samsung: Fix incorrect check after code merge
  thermal/intel_powerclamp: fix __percpu declaration of worker_data

Delta		File
+17	-4	drivers/thermal/intel/int340x_thermal/int3400_thermal.c
+4	-5	drivers/thermal/broadcom/bcm2835_thermal.c
+5	-2	drivers/thermal/mtk_thermal.c
+2	-2	drivers/thermal/intel/intel_powerclamp.c
+1	-2	drivers/thermal/cpu_cooling.c
+1	-1	drivers/thermal/samsung/exynos_tmu.c
+30	-16	6 files

Unified Split Raw