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/debugfs-cec-error-inj | |
| parent | 85ccf83e5c5b032dad0d3b162f3408a7fc32c0e7 (diff) | |
| parent | 3cea11cd5e3b00d91caf0b4730194039b45c5891 (diff) | |
| download | linux-stable-718e43b5f850a8fb52933ac5ecf29f5eef48a349.tar.gz linux-stable-718e43b5f850a8fb52933ac5ecf29f5eef48a349.tar.bz2 linux-stable-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/debugfs-cec-error-inj')
| -rw-r--r-- | Documentation/ABI/testing/debugfs-cec-error-inj | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/ABI/testing/debugfs-cec-error-inj b/Documentation/ABI/testing/debugfs-cec-error-inj index 5afcd78fbdb7..8debcb08a3b5 100644 --- a/Documentation/ABI/testing/debugfs-cec-error-inj +++ b/Documentation/ABI/testing/debugfs-cec-error-inj @@ -23,7 +23,7 @@ error injections without having to know the details of the driver-specific commands. Note that the output of 'error-inj' shall be valid as input to 'error-inj'. -So this must work: +So this must work:: $ cat error-inj >einj.txt $ cat einj.txt >error-inj |