summaryrefslogtreecommitdiffstats
path: root/Documentation/ABI
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-05-21 08:27:15 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-05-21 08:27:15 +0200
commitc049ffb35ac4a393919a001f8f468c43cb185a34 (patch)
tree3d8835848724bebf6326aaed3ae5e4dd8d302057 /Documentation/ABI
parentbaf12d6ddeae74dfcfd5d19fce86260a2e1e44f2 (diff)
parent771c577c23bac90597c685971d7297ea00f99d11 (diff)
downloadlinux-c049ffb35ac4a393919a001f8f468c43cb185a34.tar.gz
linux-c049ffb35ac4a393919a001f8f468c43cb185a34.tar.bz2
linux-c049ffb35ac4a393919a001f8f468c43cb185a34.zip
Merge 4.17-rc6 into usb-next
We want the bug fixes and this resolves the merge issues with the usbip driver. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'Documentation/ABI')
-rw-r--r--Documentation/ABI/testing/sysfs-class-cxl8
1 files changed, 8 insertions, 0 deletions
diff --git a/Documentation/ABI/testing/sysfs-class-cxl b/Documentation/ABI/testing/sysfs-class-cxl
index 640f65e79ef1..8e69345c37cc 100644
--- a/Documentation/ABI/testing/sysfs-class-cxl
+++ b/Documentation/ABI/testing/sysfs-class-cxl
@@ -244,3 +244,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