path: root/include/asm-generic
diff options
authorRafael J. Wysocki <>2021-02-15 18:50:01 +0100
committerRafael J. Wysocki <>2021-02-15 18:50:01 +0100
commita9a939cb34dfffb9f43b988a681d2566ca157b74 (patch)
tree2c283ea539f4b62a31aa3c6f62a6851b20260504 /include/asm-generic
parent332fd9005bd36b9e0277ea51027555cf223bd780 (diff)
parent65348ba259e27ad4b69459ef477facd4c702bbf6 (diff)
parentc4cc3141b6f8e0097a03f6885cafac957421df9e (diff)
Merge branches 'powercap' and 'pm-misc'
* powercap: powercap: intel_rapl: Use topology interface in rapl_init_domains() powercap: intel_rapl: Use topology interface in rapl_add_package() powercap/intel_rapl: add support for AlderLake Mobile powercap/drivers/dtpm: Fix size of object being allocated powercap/drivers/dtpm: Fix an IS_ERR() vs NULL check powercap/drivers/dtpm: Fix some missing unlock bugs powercap/drivers/dtpm: Fix a double shift bug powercap/drivers/dtpm: Fix __udivdi3 and __aeabi_uldivmod unresolved symbols powercap/drivers/dtpm: Add CPU energy model based support powercap/drivers/dtpm: Add API for dynamic thermal power management Documentation/powercap/dtpm: Add documentation for dtpm units: Add Watt units * pm-misc: PM: Kconfig: remove unneeded "default n" options PM: EM: update Kconfig description and drop "default n" option