]> git.dujemihanovic.xyz Git - linux.git/commitdiff
Merge branches 'pm-sleep', 'pm-opp' and 'pm-tools'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Wed, 11 Sep 2024 17:02:23 +0000 (19:02 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Wed, 11 Sep 2024 17:02:23 +0000 (19:02 +0200)
Merge updates related to system sleep, operating performance points
(OPP) updates, and PM tooling updates for 6.12-rc1:

 - Remove unused stub for saveable_highmem_page() and remove deprecated
   macros from power management documentation (Andy Shevchenko).

 - Use ysfs_emit() and sysfs_emit_at() in "show" functions in the PM
   sysfs interface (Xueqin Luo).

 - Update the maintainers information for the operating-points-v2-ti-cpu DT
   binding (Dhruva Gole).

 - Drop unnecessary of_match_ptr() from ti-opp-supply (Rob Herring).

 - Update directory handling and installation process in the pm-graph
   Makefile and add .gitignore to ignore sleepgraph.py artifacts to
   pm-graph (Amit Vadhavana, Yo-Jung Lin).

 - Make cpupower display residency value in idle-info (Aboorva
   Devarajan).

 - Add missing powercap_set_enabled() stub function to cpupower (John
   B. Wyatt IV).

 - Add SWIG support to cpupower (John B. Wyatt IV).

* pm-sleep:
  PM: hibernate: Remove unused stub for saveable_highmem_page()
  Documentation: PM: Discourage use of deprecated macros
  PM: sleep: Use sysfs_emit() and sysfs_emit_at() in "show" functions
  PM: hibernate: Use sysfs_emit() and sysfs_emit_at() in "show" functions

* pm-opp:
  dt-bindings: opp: operating-points-v2-ti-cpu: Update maintainers
  opp: ti: Drop unnecessary of_match_ptr()

* pm-tools:
  pm:cpupower: Add error warning when SWIG is not installed
  MAINTAINERS: Add Maintainers for SWIG Python bindings
  pm:cpupower: Include test_raw_pylibcpupower.py
  pm:cpupower: Add SWIG bindings files for libcpupower
  pm:cpupower: Add missing powercap_set_enabled() stub function
  pm-graph: Update directory handling and installation process in Makefile
  pm-graph: Make git ignore sleepgraph.py artifacts
  tools/cpupower: display residency value in idle-info

1  2  3  4 
MAINTAINERS

diff --cc MAINTAINERS
index 10430778c998b57944c1a6c5f07d676127e47faa,42decde3832066e43a460a83b0634e4d9af0c797,fe83ba7194eafc19efd696ba5f9e3b9b7029a608,d7c1f1c9655034e928774b9ebd31bbee055b69be..e4eb6a625febab1654bce5fb4f3800ce8a37c88c
@@@@@ -15899,15 -15880,10 -15888,13 -15891,13 +15902,15 @@@@@ F:        include/linux/fddidevice.
    F:  include/linux/hippidevice.h
    F:  include/linux/if_*
    F:  include/linux/inetdevice.h
 -  F:  include/linux/netdevice.h
 +  F:  include/linux/netdev*
 +  F:  include/linux/platform_data/wiznet.h
    F:  include/uapi/linux/cn_proc.h
 +  F:  include/uapi/linux/ethtool_netlink.h
    F:  include/uapi/linux/if_*
 -  F:  include/uapi/linux/netdevice.h
 +  F:  include/uapi/linux/netdev*
 +  F:  tools/testing/selftests/drivers/net/
 +++X:  Documentation/devicetree/bindings/net/bluetooth/
 +++X:  Documentation/devicetree/bindings/net/wireless/
    X:  drivers/net/wireless/
    
    NETWORKING DRIVERS (WIRELESS)