aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRafael J. Wysocki2022-03-18 18:53:02 +0100
committerRafael J. Wysocki2022-03-18 18:53:02 +0100
commit2d6fc1455f3f383499e013ebc4b19ff49c53c15e (patch)
treebb90524d931c64cfaf967479ffa748927a482095
parent6bf0f1c235fa9959190be6f6347e10896b197d4f (diff)
parenta11cda8e2f184e35e42bbb96a27272b3c5e801d2 (diff)
parentc7ff29763989bd09c433f73fae3c1e1c15d9cda4 (diff)
parent16c02447f3e1d7f86829ef66ce294aac38bd6b4c (diff)
Merge branches 'thermal-powerclamp', 'thermal-int340x' and 'thermal-docs'
Merge powerclamp thermal driver changes, int340x thermal driver changes and thermal documentation changes for 5.18-rc1: - Don't use bitmap_weight() in end_power_clamp() in the powerclamp driver (Yury Norov). - Update the OS policy capabilities handshake in the int340x thermal driver (Srinivas Pandruvada). - Increase the policies bitmap size in int340x (Srinivas Pandruvada). - Replace acpi_bus_get_device() with acpi_fetch_acpi_dev() in the int340x thermal driver (Rafael Wysocki). - Check for NULL after calling kmemdup() in int340x (Jiasheng Jiang). - Add Intel Dynamic Power and Thermal Framework (DPTF) kernel interface documentation (Srinivas Pandruvada). - Fix bullet list warning in the thermal documentation (Randy Dunlap). * thermal-powerclamp: thermal: intel_powerclamp: don't use bitmap_weight() in end_power_clamp() * thermal-int340x: thermal: int340x: Update OS policy capability handshake thermal: int340x: Increase bitmap size thermal: Replace acpi_bus_get_device() thermal: int340x: Check for NULL after calling kmemdup() * thermal-docs: Documentation: thermal: DPTF Documentation thermal: fix Documentation bullet list warning