From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Mon, 12 Dec 2022 15:23:36 +0000 (+0100)
Subject: Merge branches 'powercap', 'pm-x86', 'pm-opp' and 'pm-misc'
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=e0e44513c793c3e8f6ce5eff377065e67853806b;p=linux.git

Merge branches 'powercap', 'pm-x86', 'pm-opp' and 'pm-misc'

Merge power capping code updates, x86-specific power management pdate,
operating performance points library updates and miscellaneous power
management updates for 6.2-rc1:

 - Fix compiler warnings with make W=1 in the idle_inject power capping
   driver (Srinivas Pandruvada).

 - Use kstrtobool() instead of strtobool() in the power capping sysfs
   interface (Christophe JAILLET).

 - Add SCMI Powercap based power capping driver (Cristian Marussi).

 - Add Emerald Rapids support to the intel-uncore-freq driver (Artem
   Bityutskiy).

 - Repair slips in kernel-doc comments in the generic notifier code
   (Lukas Bulwahn).

 - Fix several DT issues in the OPP library reorganize code around
   opp-microvolt-<named> DT property (Viresh Kumar).

 - Allow any of opp-microvolt, opp-microamp, or opp-microwatt properties
   to be present without the others present (James Calligeros).

 - Fix clock-latency-ns property in DT example (Serge Semin).

* powercap:
  powercap: idle_inject: Fix warnings with make W=1
  powercap: Use kstrtobool() instead of strtobool()
  powercap: arm_scmi: Add SCMI Powercap based driver

* pm-x86:
  platform/x86: intel-uncore-freq: add Emerald Rapids support

* pm-opp:
  dt-bindings: opp-v2: Fix clock-latency-ns prop in example
  OPP: decouple dt properties in opp_parse_supplies()
  OPP: Simplify opp_parse_supplies() by restructuring it
  OPP: Parse named opp-microwatt property too
  dt-bindings: opp: Fix named microwatt property
  dt-bindings: opp: Fix usage of current in microwatt property

* pm-misc:
  notifier: repair slips in kernel-doc comments
---

e0e44513c793c3e8f6ce5eff377065e67853806b
diff --cc MAINTAINERS
index 1daadaa4d48be,141251b562d93,2585e7edc3358,69565ac0c2244,69565ac0c2244..19c7bdfa26fd1
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@@@@ -18059,17 -18046,9 -18063,8 -18064,17 -18064,17 +18059,17 @@@@@@ M:	Wenjia Zhang <wenjia@linux.ibm.com
     L:	linux-s390@vger.kernel.org
     L:	netdev@vger.kernel.org
     S:	Supported
 -   W:	http://www.ibm.com/developerworks/linux/linux390/
     F:	drivers/s390/net/
     
 ++  S390 MM
 ++  M:	Alexander Gordeev <agordeev@linux.ibm.com>
 ++  M:	Gerald Schaefer <gerald.schaefer@linux.ibm.com>
 ++  L:	linux-s390@vger.kernel.org
 ++  S:	Supported
 ++  T:	git git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git
 ++  F:	arch/s390/include/asm/pgtable.h
 ++  F:	arch/s390/mm
 ++  
     S390 PCI SUBSYSTEM
     M:	Niklas Schnelle <schnelle@linux.ibm.com>
     M:	Gerald Schaefer <gerald.schaefer@linux.ibm.com>