Merge tag 'acpi-5.6-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

fe67d182 · Linus Torvalds <[email protected]> · 2020-03-06 06:49:09 -06:00

Pull ACPI documentation fix from Rafael Wysocki:
 "Fix Sphinx format warinings in an ACPI fan document added recently
  (Randy Dunlap)"

* tag 'acpi-5.6-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  Documentation/admin-guide/acpi: fix fan_performance_states.rst warnings

Commit: fe67d1821fa8cd9856fc5e65d53ef73b450fa7d8
Parents: ba0ae9ac · 86dfa5be

Merge commit. Changes below are compared with the first parent: ba0ae9ac.

Changes

1 files changed · +2 −2

File	Status	Add	Del	Content
Documentation/admin-guide/acpi/fan_performance_states.rst	modified	+2	−2	View file

Documentation/admin-guide/acpi/fan_performance_states.rst

View file

diff --git a/Documentation/admin-guide/acpi/fan_performance_states.rst b/Documentation/admin-guide/acpi/fan_performance_states.rst
index 21d233c..98fe5c3 100644
--- a/Documentation/admin-guide/acpi/fan_performance_states.rst
+++ b/Documentation/admin-guide/acpi/fan_performance_states.rst
@@ -18,7 +18,7 @@ may look as follows::
 
  $ ls -l /sys/bus/acpi/devices/INT3404:00/
  total 0
-...
+ ...
  -r--r--r-- 1 root root 4096 Dec 13 20:38 state0
  -r--r--r-- 1 root root 4096 Dec 13 20:38 state1
  -r--r--r-- 1 root root 4096 Dec 13 20:38 state10
@@ -38,7 +38,7 @@ where each of the "state*" files represents one performance state of the fan
 and contains a colon-separated list of 5 integer numbers (fields) with the
 following interpretation::
 
-control_percent:trip_point_index:speed_rpm:noise_level_mdb:power_mw
+  control_percent:trip_point_index:speed_rpm:noise_level_mdb:power_mw
 
 * ``control_percent``: The percent value to be used to set the fan speed to a
   specific level using the _FSL object (0-100).