summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMauro Carvalho Chehab2019-06-18 16:39:21 +0200
committerMauro Carvalho Chehab2019-07-15 16:03:02 +0200
commit2dbc0838bcf24ca59cabc3130cf3b1d6809cdcd4 (patch)
tree3645134dcca14595ab278e6ac3b3dd9d4d738084
parentdocs: x86: move two x86-specific files to x86 arch dir (diff)
downloadkernel-qcow2-linux-2dbc0838bcf24ca59cabc3130cf3b1d6809cdcd4.tar.gz
kernel-qcow2-linux-2dbc0838bcf24ca59cabc3130cf3b1d6809cdcd4.tar.xz
kernel-qcow2-linux-2dbc0838bcf24ca59cabc3130cf3b1d6809cdcd4.zip
docs: ocxl.rst: add it to the uAPI book
The content of this file is user-faced. Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org> Acked-by: Andrew Donnellan <ajd@linux.ibm.com>
-rw-r--r--Documentation/userspace-api/accelerators/ocxl.rst (renamed from Documentation/accelerators/ocxl.rst)2
-rw-r--r--Documentation/userspace-api/index.rst1
-rw-r--r--MAINTAINERS2
3 files changed, 2 insertions, 3 deletions
diff --git a/Documentation/accelerators/ocxl.rst b/Documentation/userspace-api/accelerators/ocxl.rst
index b1cea19a90f5..14cefc020e2d 100644
--- a/Documentation/accelerators/ocxl.rst
+++ b/Documentation/userspace-api/accelerators/ocxl.rst
@@ -1,5 +1,3 @@
-:orphan:
-
========================================================
OpenCAPI (Open Coherent Accelerator Processor Interface)
========================================================
diff --git a/Documentation/userspace-api/index.rst b/Documentation/userspace-api/index.rst
index a3233da7fa88..ad494da40009 100644
--- a/Documentation/userspace-api/index.rst
+++ b/Documentation/userspace-api/index.rst
@@ -20,6 +20,7 @@ place where this information is gathered.
seccomp_filter
unshare
spec_ctrl
+ accelerators/ocxl
.. only:: subproject and html
diff --git a/MAINTAINERS b/MAINTAINERS
index f33487dabafd..8f496d76bb53 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -11535,7 +11535,7 @@ F: arch/powerpc/include/asm/pnv-ocxl.h
F: drivers/misc/ocxl/
F: include/misc/ocxl*
F: include/uapi/misc/ocxl.h
-F: Documentation/accelerators/ocxl.rst
+F: Documentation/userspace-api/accelerators/ocxl.rst
OMAP AUDIO SUPPORT
M: Peter Ujfalusi <peter.ujfalusi@ti.com>