diff options
| author | Michael Ellerman <mpe@ellerman.id.au> | 2018-06-03 13:32:02 +0300 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2018-06-03 13:32:02 +0300 |
| commit | f1079d3a3d1f468f8faa3f506c163d44fac01912 (patch) | |
| tree | 51932f197a50dde3d8623752cca73cdd82a4553e /Documentation/ABI/testing | |
| parent | b5240b14396dd9c781b5c759830560cdcf1b7a10 (diff) | |
| parent | faf37c44a105f3608115785f17cbbf3500f8bc71 (diff) | |
| download | linux-f1079d3a3d1f468f8faa3f506c163d44fac01912.tar.xz | |
Merge branch 'fixes' into next
We ended up with an ugly conflict between fixes and next in ftrace.h
involving multiple nested ifdefs, and the automatic resolution is
wrong. So merge fixes into next so we can fix it up.
Diffstat (limited to 'Documentation/ABI/testing')
| -rw-r--r-- | Documentation/ABI/testing/sysfs-class-cxl | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/Documentation/ABI/testing/sysfs-class-cxl b/Documentation/ABI/testing/sysfs-class-cxl index 267920a1874b..bbbabffc682a 100644 --- a/Documentation/ABI/testing/sysfs-class-cxl +++ b/Documentation/ABI/testing/sysfs-class-cxl @@ -246,3 +246,11 @@ Description: read only Returns 1 if the psl timebase register is synchronized with the core timebase register, 0 otherwise. Users: https://github.com/ibm-capi/libcxl + +What: /sys/class/cxl/<card>/tunneled_ops_supported +Date: May 2018 +Contact: linuxppc-dev@lists.ozlabs.org +Description: read only + Returns 1 if tunneled operations are supported in capi mode, + 0 otherwise. +Users: https://github.com/ibm-capi/libcxl |