Commit e46bfaba authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Documentation/sphinx/parallel-wrapper.sh

+1 −1
Original line number Diff line number Diff line
@@ -30,4 +30,4 @@ if [ -n "$parallel" ] ; then 
	parallel="-j$parallel"

fi



exec "$sphinx" "$parallel" "$@"
 
exec "$sphinx" $parallel "$@"

Documentation/x86/index.rst

+0 −1
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ x86-specific Documentation 
   tlb

   mtrr

   pat

   intel_mpx

   intel-iommu

   intel_txt

   amd-memory-encryption

CRA Git | Maintained and supported by SUSTech CRA and CCSE