summaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2020-02-27 11:07:13 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2020-02-27 11:07:13 -0800
commite46bfaba593c36de591a1153746af6bcb40ef67c (patch)
tree11b252d12ab86c0b2559449504da2b4c8b6ce3eb /Documentation
parented5fa5591866f95be1fe75cd267cf9df2c0390f5 (diff)
parentadc10f5b0a03606e30c704cff1f0283a696d0260 (diff)
downloadlinux-e46bfaba593c36de591a1153746af6bcb40ef67c.tar.bz2
Merge tag 'docs-5.6-fixes' of git://git.lwn.net/linux
Pull documentation fixes from Jonathan Corbet: "A pair of docs-build fixes" * tag 'docs-5.6-fixes' of git://git.lwn.net/linux: docs: Fix empty parallelism argument docs: remove MPX from the x86 toc
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/sphinx/parallel-wrapper.sh2
-rw-r--r--Documentation/x86/index.rst1
2 files changed, 1 insertions, 2 deletions
diff --git a/Documentation/sphinx/parallel-wrapper.sh b/Documentation/sphinx/parallel-wrapper.sh
index 7daf5133bdd3..e54c44ce117d 100644
--- a/Documentation/sphinx/parallel-wrapper.sh
+++ b/Documentation/sphinx/parallel-wrapper.sh
@@ -30,4 +30,4 @@ if [ -n "$parallel" ] ; then
parallel="-j$parallel"
fi
-exec "$sphinx" "$parallel" "$@"
+exec "$sphinx" $parallel "$@"
diff --git a/Documentation/x86/index.rst b/Documentation/x86/index.rst
index a8de2fbc1caa..265d9e9a093b 100644
--- a/Documentation/x86/index.rst
+++ b/Documentation/x86/index.rst
@@ -19,7 +19,6 @@ x86-specific Documentation
tlb
mtrr
pat
- intel_mpx
intel-iommu
intel_txt
amd-memory-encryption