Commit 246e179d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'docs-5.17-3' of git://git.lwn.net/linux 

Pull documentation fixes from Jonathan Corbet:
 "A few documentation fixes for 5.17"

* tag 'docs-5.17-3' of git://git.lwn.net/linux:
  docs/vm: Fix typo in *harden*
  Documentation: arm: marvell: Extend Avanta list
  docs: fix typo in Documentation/kernel-hacking/locking.rst
  docs: Hook the RTLA documents into the kernel docs build
parents 169387e2 854d0982

Documentation/arm/marvell.rst

+2 −0
Original line number Diff line number Diff line
@@ -266,10 +266,12 @@ Avanta family 
-------------



  Flavors:

       - 88F6500

       - 88F6510

       - 88F6530P

       - 88F6550

       - 88F6560

       - 88F6601



  Homepage:

	https://web.archive.org/web/20181005145041/http://www.marvell.com/broadband/

Documentation/index.rst

+1 −0
Original line number Diff line number Diff line
@@ -166,6 +166,7 @@ to ReStructured Text format, or are simply too old. 
.. toctree::

   :maxdepth: 2



   tools/index

   staging/index

   watch_queue

Documentation/kernel-hacking/locking.rst

+1 −1
Original line number Diff line number Diff line
@@ -295,7 +295,7 @@ Pete Zaitcev gives the following summary: 


-  If you are in a process context (any syscall) and want to lock other

   process out, use a mutex. You can take a mutex and sleep

   (``copy_from_user*(`` or ``kmalloc(x,GFP_KERNEL)``).

   (``copy_from_user()`` or ``kmalloc(x,GFP_KERNEL)``).



-  Otherwise (== data can be touched in an interrupt), use

   spin_lock_irqsave() and

Documentation/tools/index.rst

0 → 100644
+20 −0
Original line number Diff line number Diff line 
.. SPDX-License-Identifier: GPL-2.0



============

Kernel tools

============



This book covers user-space tools that are shipped with the kernel source;

more additions are needed here:



.. toctree::

   :maxdepth: 1



   rtla/index



.. only::  subproject and html



   Indices

   =======



   * :ref:`genindex`

Documentation/tools/rtla/index.rst

0 → 100644
+26 −0
Original line number Diff line number Diff line 
.. SPDX-License-Identifier: GPL-2.0



================================

The realtime Linux analysis tool

================================



RTLA provides a set of tools for the analysis of the kernel's realtime

behavior on specific hardware.



.. toctree::

   :maxdepth: 1



   rtla

   rtla-osnoise

   rtla-osnoise-hist

   rtla-osnoise-top

   rtla-timerlat

   rtla-timerlat-hist

   rtla-timerlat-top



.. only::  subproject and html



   Indices

   =======



   * :ref:`genindex`