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

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os 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

Linus Torvalds 6 years ago e46bfaba ed5fa559

+1 -2

2 changed files

expand all

Documentation

sphinx

parallel-wrapper.sh

x86

index.rst

+1 -1

Documentation/sphinx/parallel-wrapper.sh

··· 30 30 parallel="-j$parallel" 31 31 fi 32 32 33 - exec "$sphinx" "$parallel" "$@" 33 + exec "$sphinx" $parallel "$@"

-1

Documentation/x86/index.rst

··· 19 19 tlb 20 20 mtrr 21 21 pat 22 - intel_mpx 23 22 intel-iommu 24 23 intel_txt 25 24 amd-memory-encryption