aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab+samsung@kernel.org>2019-06-18 10:39:21 -0400
committerMauro Carvalho Chehab <mchehab+samsung@kernel.org>2019-07-15 10:03:02 -0400
commit2dbc0838bcf24ca59cabc3130cf3b1d6809cdcd4 (patch)
tree3645134dcca14595ab278e6ac3b3dd9d4d738084
parente8d776f20f92b9c679bcdcbdf3aee5026d5265f5 (diff)
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 @@
1:orphan:
2
3======================================================== 1========================================================
4OpenCAPI (Open Coherent Accelerator Processor Interface) 2OpenCAPI (Open Coherent Accelerator Processor Interface)
5======================================================== 3========================================================
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.
20 seccomp_filter 20 seccomp_filter
21 unshare 21 unshare
22 spec_ctrl 22 spec_ctrl
23 accelerators/ocxl
23 24
24.. only:: subproject and html 25.. only:: subproject and html
25 26
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
11535F: drivers/misc/ocxl/ 11535F: drivers/misc/ocxl/
11536F: include/misc/ocxl* 11536F: include/misc/ocxl*
11537F: include/uapi/misc/ocxl.h 11537F: include/uapi/misc/ocxl.h
11538F: Documentation/accelerators/ocxl.rst 11538F: Documentation/userspace-api/accelerators/ocxl.rst
11539 11539
11540OMAP AUDIO SUPPORT 11540OMAP AUDIO SUPPORT
11541M: Peter Ujfalusi <peter.ujfalusi@ti.com> 11541M: Peter Ujfalusi <peter.ujfalusi@ti.com>