Commit e46bfaba authored by Linus Torvalds's avatar Linus Torvalds

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
parents ed5fa559 adc10f5b
...@@ -30,4 +30,4 @@ if [ -n "$parallel" ] ; then ...@@ -30,4 +30,4 @@ if [ -n "$parallel" ] ; then
parallel="-j$parallel" parallel="-j$parallel"
fi fi
exec "$sphinx" "$parallel" "$@" exec "$sphinx" $parallel "$@"
...@@ -19,7 +19,6 @@ x86-specific Documentation ...@@ -19,7 +19,6 @@ x86-specific Documentation
tlb tlb
mtrr mtrr
pat pat
intel_mpx
intel-iommu intel-iommu
intel_txt intel_txt
amd-memory-encryption amd-memory-encryption
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment