diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-02-27 20:07:13 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-02-27 20:07:13 +0100 |
| commit | e46bfaba593c36de591a1153746af6bcb40ef67c (patch) | |
| tree | 11b252d12ab86c0b2559449504da2b4c8b6ce3eb /Documentation | |
| parent | Merge tag 'audit-pr-20200226' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
| parent | docs: Fix empty parallelism argument (diff) | |
| download | linux-e46bfaba593c36de591a1153746af6bcb40ef67c.tar.xz linux-e46bfaba593c36de591a1153746af6bcb40ef67c.zip | |
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.sh | 2 | ||||
| -rw-r--r-- | Documentation/x86/index.rst | 1 |
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 |