diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-01-25 10:37:59 +0100 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-01-25 10:37:59 +0100 |
commit | ec52736c35f29ed96a45e641dd6aad61bc9cb6f7 (patch) | |
tree | 942052dbf769af4f721fff253319d420df26dd12 /Documentation/ABI/testing/sysfs-class-devlink | |
parent | staging: media: atomisp: Fix size_t format specifier in hmm_alloc() debug sta... (diff) | |
parent | Linux 5.11-rc5 (diff) | |
download | linux-ec52736c35f29ed96a45e641dd6aad61bc9cb6f7.tar.xz linux-ec52736c35f29ed96a45e641dd6aad61bc9cb6f7.zip |
Merge 5.11-rc5 into staging-next
We need the IIO/Staging fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'Documentation/ABI/testing/sysfs-class-devlink')
-rw-r--r-- | Documentation/ABI/testing/sysfs-class-devlink | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/ABI/testing/sysfs-class-devlink b/Documentation/ABI/testing/sysfs-class-devlink index b662f747c83e..8a21ce515f61 100644 --- a/Documentation/ABI/testing/sysfs-class-devlink +++ b/Documentation/ABI/testing/sysfs-class-devlink @@ -5,8 +5,8 @@ Description: Provide a place in sysfs for the device link objects in the kernel at any given time. The name of a device link directory, denoted as ... above, is of the form <supplier>--<consumer> - where <supplier> is the supplier device name and <consumer> is - the consumer device name. + where <supplier> is the supplier bus:device name and <consumer> + is the consumer bus:device name. What: /sys/class/devlink/.../auto_remove_on Date: May 2020 |