diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-02-07 17:54:45 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-02-07 17:54:45 -0500 |
| commit | 74e96711e3379fc66630f2a1d184947f80cf2c48 (patch) | |
| tree | 306fddc28a49e3e803060c74a6cf6ae3cf08343a | |
| parent | e303a067ceede918fbf90ff3dc8affbb98bad4e8 (diff) | |
| parent | 6a730fcb9cb472ba2d42b26a50ac65dacdd68882 (diff) | |
Merge tag 'platform-drivers-x86-v5.0-2' of git://git.infradead.org/linux-platform-drivers-x86
Pull x86 platform driver fixlet from Darren Hart:
"Correct Documentation/ABI 4.21 KernelVersion to 5.0"
* tag 'platform-drivers-x86-v5.0-2' of git://git.infradead.org/linux-platform-drivers-x86:
Documentation/ABI: Correct mlxreg-io KernelVersion for 5.0
| -rw-r--r-- | Documentation/ABI/stable/sysfs-driver-mlxreg-io | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/ABI/stable/sysfs-driver-mlxreg-io b/Documentation/ABI/stable/sysfs-driver-mlxreg-io index 9b642669cb16..169fe08a649b 100644 --- a/Documentation/ABI/stable/sysfs-driver-mlxreg-io +++ b/Documentation/ABI/stable/sysfs-driver-mlxreg-io | |||
| @@ -24,7 +24,7 @@ What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/ | |||
| 24 | cpld3_version | 24 | cpld3_version |
| 25 | 25 | ||
| 26 | Date: November 2018 | 26 | Date: November 2018 |
| 27 | KernelVersion: 4.21 | 27 | KernelVersion: 5.0 |
| 28 | Contact: Vadim Pasternak <vadimpmellanox.com> | 28 | Contact: Vadim Pasternak <vadimpmellanox.com> |
| 29 | Description: These files show with which CPLD versions have been burned | 29 | Description: These files show with which CPLD versions have been burned |
| 30 | on LED board. | 30 | on LED board. |
| @@ -35,7 +35,7 @@ What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/ | |||
| 35 | jtag_enable | 35 | jtag_enable |
| 36 | 36 | ||
| 37 | Date: November 2018 | 37 | Date: November 2018 |
| 38 | KernelVersion: 4.21 | 38 | KernelVersion: 5.0 |
| 39 | Contact: Vadim Pasternak <vadimpmellanox.com> | 39 | Contact: Vadim Pasternak <vadimpmellanox.com> |
| 40 | Description: These files enable and disable the access to the JTAG domain. | 40 | Description: These files enable and disable the access to the JTAG domain. |
| 41 | By default access to the JTAG domain is disabled. | 41 | By default access to the JTAG domain is disabled. |
| @@ -105,7 +105,7 @@ What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/ | |||
| 105 | reset_voltmon_upgrade_fail | 105 | reset_voltmon_upgrade_fail |
| 106 | 106 | ||
| 107 | Date: November 2018 | 107 | Date: November 2018 |
| 108 | KernelVersion: 4.21 | 108 | KernelVersion: 5.0 |
| 109 | Contact: Vadim Pasternak <vadimpmellanox.com> | 109 | Contact: Vadim Pasternak <vadimpmellanox.com> |
| 110 | Description: These files show the system reset cause, as following: ComEx | 110 | Description: These files show the system reset cause, as following: ComEx |
| 111 | power fail, reset from ComEx, system platform reset, reset | 111 | power fail, reset from ComEx, system platform reset, reset |
