Merge tag 'docs-5.6-fixes' of git://git.lwn.net/linux

e46bfaba · Linus Torvalds <[email protected]> · 2020-02-27 11:07:13 -08:00

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

Commit: e46bfaba593c36de591a1153746af6bcb40ef67c
Parents: ed5fa559 · adc10f5b

Merge commit. Changes below are compared with the first parent: ed5fa559.

Changes

2 files changed · +1 −2

File	Status	Add	Del	Content
Documentation/sphinx/parallel-wrapper.sh	modified	+1	−1	View file
Documentation/x86/index.rst	modified	+0	−1	View file

Documentation/sphinx/parallel-wrapper.sh

View file

diff --git a/Documentation/sphinx/parallel-wrapper.sh b/Documentation/sphinx/parallel-wrapper.sh
index 7daf513..e54c44c 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 "$@"

Documentation/x86/index.rst

View file

diff --git a/Documentation/x86/index.rst b/Documentation/x86/index.rst
index a8de2fb..265d9e9 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