Commit 0f4b9289 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'docs-5.15-2' of git://git.lwn.net/linux 

Pull more documentation updates from Jonathan Corbet:
 "Another collection of documentation patches, mostly fixes but also
  includes another set of traditional Chinese translations"

* tag 'docs-5.15-2' of git://git.lwn.net/linux:
  docs: pdfdocs: Fix typo in CJK-language specific font settings
  docs: kernel-hacking: Remove inappropriate text
  docs/zh_TW: add translations for zh_TW/filesystems
  docs/zh_TW: add translations for zh_TW/cpu-freq
  docs/zh_TW: add translations for zh_TW/arm64
  docs/zh_CN: Modify the translator tag and fix the wrong word
  Documentation/features/vm: correct huge-vmap APIs
  Documentation: block: blk-mq: Fix small typo in multi-queue docs
  Documentation: in_irq() cleanup
  Documentation: arm: marvell: Add 88F6825 model into list
  Documentation/process/maintainer-pgp-guide: Replace broken link to PGP path finder
  Documentation: locking: fix references
  Documentation: Update details of The Linux Kernel Module Programming Guide
  docs: x86: Remove obsolete information about x86_64 vmalloc() faulting
  Documentation/process/applying-patches: Activate linux-next man hyperlink
parents 6dcaf9fb 7c5c18bd

Documentation/arm/marvell.rst

+1 −0
Original line number Diff line number Diff line
@@ -140,6 +140,7 @@ EBU Armada family 
	- 88F6821 Armada 382

	- 88F6W21 Armada 383

	- 88F6820 Armada 385

	- 88F6825

	- 88F6828 Armada 388



    - Product infos:   https://web.archive.org/web/20181006144616/http://www.marvell.com/embedded-processors/armada-38x/

Documentation/block/blk-mq.rst

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ layer or if we want to try to merge requests. In both cases, requests will be 
sent to the software queue.



Then, after the requests are processed by software queues, they will be placed

at the hardware queue, a second stage queue were the hardware has direct access

at the hardware queue, a second stage queue where the hardware has direct access

to process those requests. However, if the hardware does not have enough

resources to accept more requests, blk-mq will places requests on a temporary

queue, to be sent in the future, when the hardware is able.

Documentation/conf.py

+2 −2
Original line number Diff line number Diff line
@@ -463,8 +463,8 @@ latex_elements['preamble'] += ''' 
	\\newcommand{\\kerneldocEndTC}{}

	\\newcommand{\\kerneldocBeginKR}{}

	\\newcommand{\\kerneldocEndKR}{}

	\\newcommand{\\kerneldocBeginSC}{}

	\\newcommand{\\kerneldocEndKR}{}

	\\newcommand{\\kerneldocBeginJP}{}

	\\newcommand{\\kerneldocEndJP}{}

    }

'''

Documentation/features/vm/huge-vmap/arch-support.txt

+1 −1
Original line number Diff line number Diff line 
#

# Feature name:          huge-vmap

#         Kconfig:       HAVE_ARCH_HUGE_VMAP

#         description:   arch supports the ioremap_pud_enabled() and ioremap_pmd_enabled() VM APIs

#         description:   arch supports the arch_vmap_pud_supported() and arch_vmap_pmd_supported() VM APIs

#

    -----------------------

    |         arch |status|

Documentation/kernel-hacking/hacking.rst

+2 −2
Original line number Diff line number Diff line
@@ -76,8 +76,8 @@ handler is never re-entered: if the same interrupt arrives, it is queued 
fast: frequently it simply acknowledges the interrupt, marks a 'software

interrupt' for execution and exits.



You can tell you are in a hardware interrupt, because

:c:func:`in_irq()` returns true.

You can tell you are in a hardware interrupt, because in_hardirq() returns

true.



.. warning::