From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Tue, 22 Jul 2025 16:07:11 +0000 (+0200)
Subject: Merge branches 'pm-misc' and 'pm-tools'
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=40c28199550d5cdace4583bfe723a7636b170a90;p=thirdparty%2Fkernel%2Flinux.git

Merge branches 'pm-misc' and 'pm-tools'

Merge miscellaneous power management updates and cpupower utility
updates for 6.17-rc1:

 - Update contact information in the PM ABI docs and maintainer
   information in the power domains DT binding (Rafael Wysocki)

 - Update PM header inclusions to follow the IWYU (Include What You Use)
   principle (Andy Shevchenko)

 - Add flags to specify power on attach/detach for PM domains, make the
   driver core detach PM domains in device_unbind_cleanup(), and drop
   the dev_pm_domain_detach() call from the platform bus type (Claudiu
   Beznea)

 - Improve Python binding's Makefile for cpupower (John B. Wyatt IV)

 - Fix printing of CORE, CPU fields in cpupower-monitor (Gautham Shenoy)

* pm-misc:
  PM: docs: Use my kernel.org address in ABI docs and DT bindings
  driver core: platform: Drop dev_pm_domain_detach() call
  PM: domains: Detach on device_unbind_cleanup()
  PM: domains: Add flags to specify power on attach/detach
  PM: Don't use "proxy" headers

* pm-tools:
  cpupower: Improve Python binding's Makefile
  pm: cpupower: Fix printing of CORE, CPU fields in cpupower-monitor
  pm: cpupower: Fix the snapshot-order of tsc,mperf, clock in mperf_stop()
---

40c28199550d5cdace4583bfe723a7636b170a90
diff --cc Documentation/ABI/testing/sysfs-devices-power
index d3da88b26a536,9330fb3c79e22,d3da88b26a536..e4ec5de9a5dd2
--- a/Documentation/ABI/testing/sysfs-devices-power
+++ b/Documentation/ABI/testing/sysfs-devices-power
@@@@ -53,10 -53,10 -53,10 +53,10 @@@@ Description
   
   What:		/sys/devices/.../power/async
   Date:		January 2009
- -Contact:	Rafael J. Wysocki <rjw@rjwysocki.net>
+ +Contact:	Rafael J. Wysocki <rafael@kernel.org>
   Description:
   		The /sys/devices/.../async attribute allows the user space to
 - 		enable or diasble the device's suspend and resume callbacks to
 + 		enable or disable the device's suspend and resume callbacks to
   		be executed asynchronously (ie. in separate threads, in parallel
   		with the main suspend/resume thread) during system-wide power
   		transitions (eg. suspend to RAM, hibernation).