Skip to content

Commit

Permalink
Merge tag 'docs-6.8' of git://git.lwn.net/linux
Browse files Browse the repository at this point in the history
Pull documentation update from Jonathan Corbet:
 "Another moderately busy cycle for documentation, including:

   - The minimum Sphinx requirement has been raised to 2.4.4, following
     a warning that was added in 6.2

   - Some reworking of the Documentation/process front page to,
     hopefully, make it more useful

   - Various kernel-doc tweaks to, for example, make it deal properly
     with __counted_by annotations

   - We have also restored a warning for documentation of nonexistent
     structure members that disappeared a while back. That had the
     delightful consequence of adding some 600 warnings to the docs
     build. A sustained effort by Randy, Vegard, and myself has
     addressed almost all of those, bringing the documentation back into
     sync with the code. The fixes are going through the appropriate
     maintainer trees

   - Various improvements to the HTML rendered docs, including automatic
     links to Git revisions and a nice new pulldown to make translations
     easy to access

   - Speaking of translations, more of those for Spanish and Chinese

  ... plus the usual stream of documentation updates and typo fixes"

* tag 'docs-6.8' of git://git.lwn.net/linux: (57 commits)
  MAINTAINERS: use tabs for indent of CONFIDENTIAL COMPUTING THREAT MODEL
  A reworked process/index.rst
  ring-buffer/Documentation: Add documentation on buffer_percent file
  Translated the RISC-V architecture boot documentation.
  Docs: remove mentions of fdformat from util-linux
  Docs/zh_CN: Fix the meaning of DEBUG to pr_debug()
  Documentation: move driver-api/dcdbas to userspace-api/
  Documentation: move driver-api/isapnp to userspace-api/
  Documentation/core-api : fix typo in workqueue
  Documentation/trace: Fixed typos in the ftrace FLAGS section
  kernel-doc: handle a void function without producing a warning
  scripts/get_abi.pl: ignore some temp files
  docs: kernel_abi.py: fix command injection
  scripts/get_abi: fix source path leak
  CREDITS, MAINTAINERS, docs/process/howto: Update man-pages' maintainer
  docs: translations: add translations links when they exist
  kernel-doc: Align quick help and the code
  MAINTAINERS: add reviewer for Spanish translations
  docs: ignore __counted_by attribute in structure definitions
  scripts: kernel-doc: Clarify missing struct member description
  ..
  • Loading branch information
torvalds committed Jan 12, 2024
2 parents 22d29f1 + 2d179e8 commit 5b9b416
Show file tree
Hide file tree
Showing 153 changed files with 3,206 additions and 794 deletions.
7 changes: 7 additions & 0 deletions CREDITS
Original file line number Diff line number Diff line change
Expand Up @@ -1835,6 +1835,13 @@ S: K osmidomkum 723
S: 160 00 Praha 6
S: Czech Republic

N: Michael Kerrisk
E: [email protected]
W: https://man7.org/
P: 4096R/3A35CE5E E522 595B 52ED A4E6 BFCC CB5E 8561 9911 3A35 CE5E
D: Maintainer of the Linux man-pages project
D: Linux man pages online, at <https://man7.org/linux/man-pages/>

N: Niels Kristian Bech Jensen
E: [email protected]
D: Miscellaneous kernel updates and fixes.
Expand Down
2 changes: 1 addition & 1 deletion Documentation/admin-guide/abi-obsolete.rst
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ marked to be removed at some later point in time.
The description of the interface will document the reason why it is
obsolete and when it can be expected to be removed.

.. kernel-abi:: $srctree/Documentation/ABI/obsolete
.. kernel-abi:: ABI/obsolete
:rst:
2 changes: 1 addition & 1 deletion Documentation/admin-guide/abi-removed.rst
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ABI removed symbols
===================

.. kernel-abi:: $srctree/Documentation/ABI/removed
.. kernel-abi:: ABI/removed
:rst:
2 changes: 1 addition & 1 deletion Documentation/admin-guide/abi-stable.rst
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ for at least 2 years.
Most interfaces (like syscalls) are expected to never change and always
be available.

.. kernel-abi:: $srctree/Documentation/ABI/stable
.. kernel-abi:: ABI/stable
:rst:
2 changes: 1 addition & 1 deletion Documentation/admin-guide/abi-testing.rst
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@ Programs that use these interfaces are strongly encouraged to add their
name to the description of these interfaces, so that the kernel
developers can easily notify them if any changes occur.

.. kernel-abi:: $srctree/Documentation/ABI/testing
.. kernel-abi:: ABI/testing
:rst:
6 changes: 3 additions & 3 deletions Documentation/admin-guide/dynamic-debug-howto.rst
Original file line number Diff line number Diff line change
Expand Up @@ -321,13 +321,13 @@ Examples
:#> ddcmd 'format "nfsd: READ" +p'

// enable messages in files of which the paths include string "usb"
:#> ddcmd 'file *usb* +p' > /proc/dynamic_debug/control
:#> ddcmd 'file *usb* +p'

// enable all messages
:#> ddcmd '+p' > /proc/dynamic_debug/control
:#> ddcmd '+p'

// add module, function to all enabled messages
:#> ddcmd '+mf' > /proc/dynamic_debug/control
:#> ddcmd '+mf'

// boot-args example, with newlines and comments for readability
Kernel command line: ...
Expand Down
11 changes: 11 additions & 0 deletions Documentation/admin-guide/kernel-parameters.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
accept_memory= [MM]
Format: { eager | lazy }
default: lazy
By default, unaccepted memory is accepted lazily to
avoid prolonged boot times. The lazy option will add
some runtime overhead until all memory is eventually
accepted. In most cases the overhead is negligible.
For some workloads or for debugging purposes
accept_memory=eager can be used to accept all memory
at once during boot.

acpi= [HW,ACPI,X86,ARM64,RISCV64]
Advanced Configuration and Power Interface
Format: { force | on | off | strict | noirq | rsdt |
Expand Down
10 changes: 1 addition & 9 deletions Documentation/admin-guide/media/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,8 @@ Documentation/driver-api/media/index.rst
- for driver development information and Kernel APIs used by
media devices;

The media subsystem
===================

.. only:: html

.. class:: toc-title

Table of Contents

.. toctree::
:caption: Table of Contents
:maxdepth: 2
:numbered:

Expand Down
2 changes: 1 addition & 1 deletion Documentation/arch/x86/boot.rst
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ Protocol 2.13 (Kernel 3.14) Support 32- and 64-bit flags being set in

Protocol 2.14 BURNT BY INCORRECT COMMIT
ae7e1238e68f2a472a125673ab506d49158c1889
(x86/boot: Add ACPI RSDP address to setup_header)
("x86/boot: Add ACPI RSDP address to setup_header")
DO NOT USE!!! ASSUME SAME AS 2.13.

Protocol 2.15 (Kernel 5.5) Added the kernel_info and kernel_info.setup_type_max.
Expand Down
6 changes: 2 additions & 4 deletions Documentation/bpf/btf.rst
Original file line number Diff line number Diff line change
Expand Up @@ -272,10 +272,8 @@ In this case, if the base type is an int type, it must be a regular int type:
* ``BTF_INT_OFFSET()`` must be 0.
* ``BTF_INT_BITS()`` must be equal to ``{1,2,4,8,16} * 8``.

The following kernel patch introduced ``kind_flag`` and explained why both
modes exist:

https://github.com/torvalds/linux/commit/9d5f9f701b1891466fb3dbb1806ad97716f95cc3#diff-fa650a64fdd3968396883d2fe8215ff3
Commit 9d5f9f701b18 introduced ``kind_flag`` and explains why both modes
exist.

2.2.6 BTF_KIND_ENUM
~~~~~~~~~~~~~~~~~~~
Expand Down
9 changes: 7 additions & 2 deletions Documentation/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,15 +47,15 @@ def have_command(cmd):
# -- General configuration ------------------------------------------------

# If your documentation needs a minimal Sphinx version, state it here.
needs_sphinx = '1.7'
needs_sphinx = '2.4.4'

# Add any Sphinx extension module names here, as strings. They can be
# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
# ones.
extensions = ['kerneldoc', 'rstFlatTable', 'kernel_include',
'kfigure', 'sphinx.ext.ifconfig', 'automarkup',
'maintainers_include', 'sphinx.ext.autosectionlabel',
'kernel_abi', 'kernel_feat']
'kernel_abi', 'kernel_feat', 'translations']

if major >= 3:
if (major > 3) or (minor > 0 or patch >= 2):
Expand Down Expand Up @@ -106,6 +106,7 @@ def have_command(cmd):
"__weak",
"noinline",
"__fix_address",
"__counted_by",

# include/linux/memblock.h:
"__init_memblock",
Expand Down Expand Up @@ -357,6 +358,10 @@ def get_cline_version():
if html_theme == 'alabaster':
html_sidebars['**'].insert(0, 'about.html')

# The name of an image file (relative to this directory) to place at the top
# of the sidebar.
html_logo = 'images/logo.svg'

# Output file base name for HTML help builder.
htmlhelp_basename = 'TheLinuxKerneldoc'

Expand Down
2 changes: 1 addition & 1 deletion Documentation/core-api/dma-api-howto.rst
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Dynamic DMA mapping Guide

This is a guide to device driver writers on how to use the DMA API
with example pseudo-code. For a concise description of the API, see
DMA-API.txt.
Documentation/core-api/dma-api.rst.

CPU and DMA addresses
=====================
Expand Down
2 changes: 1 addition & 1 deletion Documentation/core-api/dma-api.rst
Original file line number Diff line number Diff line change
Expand Up @@ -448,7 +448,7 @@ DMA address entries returned.

Synchronise a single contiguous or scatter/gather mapping for the CPU
and device. With the sync_sg API, all the parameters must be the same
as those passed into the single mapping API. With the sync_single API,
as those passed into the sg mapping API. With the sync_single API,
you can use dma_handle and size parameters that aren't identical to
those passed into the single mapping API to do a partial sync.

Expand Down
2 changes: 1 addition & 1 deletion Documentation/core-api/workqueue.rst
Original file line number Diff line number Diff line change
Expand Up @@ -379,7 +379,7 @@ Workqueue currently supports the following affinity scopes.
cases. This is the default affinity scope.

``numa``
CPUs are grouped according to NUMA bounaries.
CPUs are grouped according to NUMA boundaries.

``system``
All CPUs are put in the same group. Workqueue makes no effort to process a
Expand Down
5 changes: 1 addition & 4 deletions Documentation/crypto/api.rst
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
Programming Interface
=====================

.. class:: toc-title

Table of contents

.. toctree::
:caption: Table of contents
:maxdepth: 2

api-skcipher
Expand Down
5 changes: 1 addition & 4 deletions Documentation/crypto/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,8 @@ This documentation outlines the Linux kernel crypto API with its
concepts, details about developing cipher implementations, employment of the API
for cryptographic use cases, as well as programming examples.

.. class:: toc-title

Table of contents

.. toctree::
:caption: Table of contents
:maxdepth: 2

intro
Expand Down
5 changes: 1 addition & 4 deletions Documentation/dev-tools/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,8 @@ whole; patches welcome!
A brief overview of testing-specific tools can be found in
Documentation/dev-tools/testing-overview.rst

.. class:: toc-title

Table of contents

.. toctree::
:caption: Table of contents
:maxdepth: 2

testing-overview
Expand Down
11 changes: 10 additions & 1 deletion Documentation/doc-guide/sphinx.rst
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ Sphinx Install
==============

The ReST markups currently used by the Documentation/ files are meant to be
built with ``Sphinx`` version 1.7 or higher.
built with ``Sphinx`` version 2.4.4 or higher.

There's a script that checks for the Sphinx requirements. Please see
:ref:`sphinx-pre-install` for further details.
Expand Down Expand Up @@ -435,6 +435,15 @@ path.
For information on cross-referencing to kernel-doc functions or types, see
Documentation/doc-guide/kernel-doc.rst.

Referencing commits
~~~~~~~~~~~~~~~~~~~

References to git commits are automatically hyperlinked given that they are
written in one of these formats::

commit 72bf4f1767f0
commit 72bf4f1767f0 ("net: do not leave an empty skb in write queue")

.. _sphinx_kfigure:

Figures & Images
Expand Down
8 changes: 2 additions & 6 deletions Documentation/driver-api/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,8 @@ of device drivers. This document is an only somewhat organized collection
of some of those interfaces — it will hopefully get better over time! The
available subsections can be seen below.

.. class:: toc-title

Table of contents

.. toctree::
:caption: Table of contents
:maxdepth: 2

driver-model/index
Expand Down Expand Up @@ -81,10 +78,8 @@ available subsections can be seen below.
backlight/lp855x-driver.rst
connector
console
dcdbas
eisa
isa
isapnp
io-mapping
io_ordering
generic-counter
Expand Down Expand Up @@ -117,6 +112,7 @@ available subsections can be seen below.
dpll
wbrf
crypto/index
tee

.. only:: subproject and html

Expand Down
7 changes: 1 addition & 6 deletions Documentation/driver-api/media/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,8 @@ Documentation/userspace-api/media/index.rst
- for the userspace APIs used on media devices.


.. only:: html

.. class:: toc-title

Table of Contents

.. toctree::
:caption: Table of Contents
:maxdepth: 5
:numbered:

Expand Down
7 changes: 1 addition & 6 deletions Documentation/driver-api/mei/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,8 @@ Intel(R) Management Engine Interface (Intel(R) MEI)
**Copyright** |copy| 2019 Intel Corporation


.. only:: html

.. class:: toc-title

Table of Contents

.. toctree::
:caption: Table of Contents
:maxdepth: 3

mei
Expand Down
8 changes: 7 additions & 1 deletion Documentation/driver-api/nvmem.rst
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ A NVMEM provider can register with NVMEM core by supplying relevant
nvmem configuration to nvmem_register(), on success core would return a valid
nvmem_device pointer.

nvmem_unregister(nvmem) is used to unregister a previously registered provider.
nvmem_unregister() is used to unregister a previously registered provider.

For example, a simple nvram case::

Expand Down Expand Up @@ -200,3 +200,9 @@ and let you add cells dynamically.
Another use case for layouts is the post processing of cells. With layouts,
it is possible to associate a custom post processing hook to a cell. It
even possible to add this hook to cells not created by the layout itself.

9. Internal kernel API
======================

.. kernel-doc:: drivers/nvmem/core.c
:export:
5 changes: 1 addition & 4 deletions Documentation/driver-api/pci/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,8 @@
The Linux PCI driver implementer's API guide
============================================

.. class:: toc-title

Table of contents

.. toctree::
:caption: Table of contents
:maxdepth: 2

pci
Expand Down
Loading

0 comments on commit 5b9b416

Please sign in to comment.