diff options
author | Arnd Bergmann <arnd@arndb.de> | 2020-11-27 21:04:53 +0100 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2020-11-27 21:04:53 +0100 |
commit | 718e43b5f850a8fb52933ac5ecf29f5eef48a349 (patch) | |
tree | 7b300d58e0c4c654c62e9d9873097ad0a860367d /Documentation/ABI/testing/sysfs-platform-intel-wmi-sbl-fw-update | |
parent | Merge tag 'tegra-for-5.11-firmware' of git://git.kernel.org/pub/scm/linux/ker... (diff) | |
parent | Linux 5.10-rc2 (diff) | |
download | linux-718e43b5f850a8fb52933ac5ecf29f5eef48a349.tar.xz linux-718e43b5f850a8fb52933ac5ecf29f5eef48a349.zip |
Backmerge tag 'v5.10-rc2' into arm/drivers
The SCMI pull request for the arm/drivers branch requires v5.10-rc2
because of dependencies with other git trees, so merge that in here.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'Documentation/ABI/testing/sysfs-platform-intel-wmi-sbl-fw-update')
-rw-r--r-- | Documentation/ABI/testing/sysfs-platform-intel-wmi-sbl-fw-update | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/ABI/testing/sysfs-platform-intel-wmi-sbl-fw-update b/Documentation/ABI/testing/sysfs-platform-intel-wmi-sbl-fw-update index 5aa618987cad..02ae1e9bbfc8 100644 --- a/Documentation/ABI/testing/sysfs-platform-intel-wmi-sbl-fw-update +++ b/Documentation/ABI/testing/sysfs-platform-intel-wmi-sbl-fw-update @@ -8,5 +8,6 @@ Description: of 0 and userspace can signal SBL to update firmware, on next reboot, by writing a value of 1. There are two available states: + * 0 -> Skip firmware update while rebooting * 1 -> Attempt firmware update on next reboot |