From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Mon, 20 Jan 2025 12:10:15 +0000 (+0100)
Subject: Merge branch 'thermal-intel'
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=2dc748695568a02199e813d408a8f6f58919f4bd;p=users%2Fjedix%2Flinux-maple.git

Merge branch 'thermal-intel'

Merge updates of Intel thermal drivers for 6.14:

 - Add support for Panther Lake processors in multiple places (Zhang
   Rui, Srinivas Pandruvada).

 - Remove explicit user_space governor selection from Intel thermal
   drivers (Srinivas Pandruvada).

* thermal-intel:
  thermal: intel: Fix compile issue when CONFIG_NET is not defined
  thermal: intel: int340x: Panther Lake power floor and workload hint support
  thermal: intel: int340x: Panther Lake DLVR support
  thermal: intel: Remove explicit user_space governor selection
  ACPI: DPTF: Support Panther Lake
  thermal: intel: int340x: processor: Enable MMIO RAPL for Panther Lake
  powercap: intel_rapl: Add support for Panther Lake platform
---

2dc748695568a02199e813d408a8f6f58919f4bd