diff options
| author | Linus Torvalds | 2023-05-05 12:05:00 -0700 |
|---|---|---|
| committer | Linus Torvalds | 2023-05-05 12:05:00 -0700 |
| commit | 817e1af1b37230ef6bb40bec6ccaf9a800ee6610 (patch) | |
| tree | e9601541887264f926fad191011a1cc34c0e05a6 /MAINTAINERS | |
| parent | b49178e68fc7e3333c3d9f96eb09937ca84d05fd (diff) | |
| parent | 2492ba4cd06dd24076f44327174816b04cddde90 (diff) | |
Merge tag 'thermal-6.4-rc1-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull thermal control fixes from Rafael Wysocki:
"These fix a NULL pointer dereference in the Intel powerclamp driver
introduced during the 6.3 cycle and update MAINTAINERS to match recent
code changes.
Specifics:
- Fix NULL pointer access in the Intel powerclamp thermal driver that
occurs on attempts to set the cooling device state to 0 in the
default configuration (Srinivas Pandruvada)
- Drop the stale MAINTAINERS entry for the Intel Menlow thermal
driver that has been removed recently (Lukas Bulwahn)"
* tag 'thermal-6.4-rc1-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
MAINTAINERS: remove section INTEL MENLOW THERMAL DRIVER
thermal: intel: powerclamp: Fix NULL pointer access issue
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index e5c3101161d1..4accfb9f0865 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -10556,12 +10556,6 @@ F: drivers/hwmon/intel-m10-bmc-hwmon.c F: drivers/mfd/intel-m10-bmc* F: include/linux/mfd/intel-m10-bmc.h -INTEL MENLOW THERMAL DRIVER -M: Sujith Thomas <sujith.thomas@intel.com> -L: linux-pm@vger.kernel.org -S: Supported -F: drivers/thermal/intel/intel_menlow.c - INTEL P-Unit IPC DRIVER M: Zha Qipeng <qipeng.zha@intel.com> L: platform-driver-x86@vger.kernel.org |