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

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

Pull documentation fixes from Jonathan Corbet:
 "A few fixes for the docs tree, including one for a 4.11 build
  regression"

* tag 'docs-4.11-fixes' of git://git.lwn.net/linux:
  Documentation/sphinx: fix primary_domain configuration
  docs: Fix htmldocs build failure
  doc/ko_KR/memory-barriers: Update control-dependencies section
  pcieaer doc: update the link
  Documentation: Update path to sysrq.txt
parents 91aff98b fd5d6669

Documentation/DocBook/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -7,12 +7,12 @@ 
# list of DOCBOOKS.



DOCBOOKS := z8530book.xml  \

	    kernel-hacking.xml kernel-locking.xml deviceiobook.xml \

	    kernel-hacking.xml kernel-locking.xml \

	    writing_usb_driver.xml networking.xml \

	    kernel-api.xml filesystems.xml lsm.xml kgdb.xml \

	    gadget.xml libata.xml mtdnand.xml librs.xml rapidio.xml \

	    genericirq.xml s390-drivers.xml scsi.xml \

	    sh.xml regulator.xml w1.xml \

	    sh.xml w1.xml \

	    writing_musb_glue_layer.xml



ifeq ($(DOCBOOKS),)

Documentation/PCI/pcieaer-howto.txt

+1 −1
Original line number Diff line number Diff line
@@ -256,7 +256,7 @@ After reboot with new kernel or insert the module, a device file named 


Then, you need a user space tool named aer-inject, which can be gotten

from:

    http://www.kernel.org/pub/linux/utils/pci/aer-inject/

    https://git.kernel.org/cgit/linux/kernel/git/gong.chen/aer-inject.git/



More information about aer-inject can be found in the document comes

with its source code.

Documentation/conf.py

+1 −1
Original line number Diff line number Diff line
@@ -135,7 +135,7 @@ pygments_style = 'sphinx' 
# If true, `todo` and `todoList` produce output, else they produce nothing.

todo_include_todos = False



primary_domain = 'C'

primary_domain = 'c'

highlight_language = 'none'



# -- Options for HTML output ----------------------------------------------

Documentation/media/v4l-drivers/bttv.rst

+1 −1
Original line number Diff line number Diff line
@@ -312,7 +312,7 @@ information out of a register+stack dump printed by the kernel on 
protection faults (so-called "kernel oops").



If you run into some kind of deadlock, you can try to dump a call trace

for each process using sysrq-t (see Documentation/sysrq.txt).

for each process using sysrq-t (see Documentation/admin-guide/sysrq.rst).

This way it is possible to figure where *exactly* some process in "D"

state is stuck.

Documentation/s390/Debugging390.txt

+1 −1
Original line number Diff line number Diff line
@@ -2116,7 +2116,7 @@ The sysrq key reading is very picky ( I have to type the keys in an 
This is particularly useful for syncing disks unmounting & rebooting

if the machine gets partially hung.



Read Documentation/sysrq.txt for more info

Read Documentation/admin-guide/sysrq.rst for more info



References:

===========

CRA Git | Maintained and supported by SUSTech CRA and CCSE