Skip to content

Commit

Permalink
Merge tag 'docs-6.4' of git://git.lwn.net/linux
Browse files Browse the repository at this point in the history
Pull documentation updates from Jonathan Corbet:
 "Commit volume in documentation is relatively low this time, but there
  is still a fair amount going on, including:

   - Reorganize the architecture-specific documentation under
     Documentation/arch

     This makes the structure match the source directory and helps to
     clean up the mess that is the top-level Documentation directory a
     bit. This work creates the new directory and moves x86 and most of
     the less-active architectures there.

     The current plan is to move the rest of the architectures in 6.5,
     with the patches going through the appropriate subsystem trees.

   - Some more Spanish translations and maintenance of the Italian
     translation

   - A new "Kernel contribution maturity model" document from Ted

   - A new tutorial on quickly building a trimmed kernel from Thorsten

  Plus the usual set of updates and fixes"

* tag 'docs-6.4' of git://git.lwn.net/linux: (47 commits)
  media: Adjust column width for pdfdocs
  media: Fix building pdfdocs
  docs: clk: add documentation to log which clocks have been disabled
  docs: trace: Fix typo in ftrace.rst
  Documentation/process: always CC responsible lists
  docs: kmemleak: adjust to config renaming
  ELF: document some de-facto PT_* ABI quirks
  Documentation: arm: remove stih415/stih416 related entries
  docs: turn off "smart quotes" in the HTML build
  Documentation: firmware: Clarify firmware path usage
  docs/mm: Physical Memory: Fix grammar
  Documentation: Add document for false sharing
  dma-api-howto: typo fix
  docs: move m68k architecture documentation under Documentation/arch/
  docs: move parisc documentation under Documentation/arch/
  docs: move ia64 architecture docs under Documentation/arch/
  docs: Move arc architecture docs under Documentation/arch/
  docs: move nios2 documentation under Documentation/arch/
  docs: move openrisc documentation under Documentation/arch/
  docs: move superh documentation under Documentation/arch/
  ...
  • Loading branch information
torvalds committed Apr 24, 2023
2 parents 1be89fa + 7e8472c commit c23f289
Show file tree
Hide file tree
Showing 186 changed files with 2,622 additions and 629 deletions.
16 changes: 16 additions & 0 deletions CREDITS
Original file line number Diff line number Diff line change
Expand Up @@ -229,6 +229,10 @@ S: University of Notre Dame
S: Notre Dame, Indiana
S: USA

N: Kai Bankett
E: [email protected]
D: QNX6 filesystem

N: Greg Banks
E: [email protected]
D: IDT77105 ATM network driver
Expand Down Expand Up @@ -886,6 +890,10 @@ W: http://jdelvare.nerim.net/
D: Several hardware monitoring drivers
S: France

N: Frank "Jedi/Sector One" Denis
E: [email protected]
D: QNX4 filesystem

N: Peter Denison
E: [email protected]
W: http://www.pnd-pc.demon.co.uk/promise/
Expand Down Expand Up @@ -1259,6 +1267,10 @@ S: USA
N: Adam Fritzler
E: [email protected]

N: Richard "Scuba" A. Frowijn
E: [email protected]
D: QNX4 filesystem

N: Fernando Fuganti
E: [email protected]
E: [email protected]
Expand Down Expand Up @@ -2218,6 +2230,10 @@ D: Digiboard PC/Xe and PC/Xi, Digiboard EPCA
D: NUMA support, Slab allocators, Page migration
D: Scalability, Time subsystem

N: Anders Larsen
E: [email protected]
D: QNX4 filesystem

N: Paul Laufer
E: [email protected]
D: Soundblaster driver fixes, ISAPnP quirk
Expand Down
2 changes: 1 addition & 1 deletion Documentation/admin-guide/hw-vuln/mds.rst
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ Because the buffers are potentially shared between Hyper-Threads cross
Hyper-Thread attacks are possible.

Deeper technical information is available in the MDS specific x86
architecture section: :ref:`Documentation/x86/mds.rst <mds>`.
architecture section: :ref:`Documentation/arch/x86/mds.rst <mds>`.


Attack scenarios
Expand Down
2 changes: 1 addition & 1 deletion Documentation/admin-guide/hw-vuln/tsx_async_abort.rst
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ attacker needs to begin a TSX transaction and raise an asynchronous abort
which in turn potentially leaks data stored in the buffers.

More detailed technical information is available in the TAA specific x86
architecture section: :ref:`Documentation/x86/tsx_async_abort.rst <tsx_async_abort>`.
architecture section: :ref:`Documentation/arch/x86/tsx_async_abort.rst <tsx_async_abort>`.


Attack scenarios
Expand Down
1 change: 1 addition & 0 deletions Documentation/admin-guide/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ problems and bugs in particular.

reporting-issues
reporting-regressions
quickly-build-trimmed-linux
bug-hunting
bug-bisect
tainted-kernels
Expand Down
8 changes: 4 additions & 4 deletions Documentation/admin-guide/kernel-parameters.rst
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ parameter is applicable::
LOOP Loopback device support is enabled.
M68k M68k architecture is enabled.
These options have more detailed description inside of
Documentation/m68k/kernel-options.rst.
Documentation/arch/m68k/kernel-options.rst.
MDA MDA console support is enabled.
MIPS MIPS architecture is enabled.
MOUSE Appropriate mouse support is enabled.
Expand Down Expand Up @@ -178,7 +178,7 @@ parameter is applicable::
X86-32 X86-32, aka i386 architecture is enabled.
X86-64 X86-64 architecture is enabled.
More X86-64 boot options can be found in
Documentation/x86/x86_64/boot-options.rst.
Documentation/arch/x86/x86_64/boot-options.rst.
X86 Either 32-bit or 64-bit x86 (same as X86-32+X86-64)
X86_UV SGI UV support is enabled.
XEN Xen support is enabled
Expand All @@ -193,10 +193,10 @@ In addition, the following text indicates that the option::
Parameters denoted with BOOT are actually interpreted by the boot
loader, and have no meaning to the kernel directly.
Do not modify the syntax of boot loader parameters without extreme
need or coordination with <Documentation/x86/boot.rst>.
need or coordination with <Documentation/arch/x86/boot.rst>.

There are also arch-specific kernel-parameters not documented here.
See for example <Documentation/x86/x86_64/boot-options.rst>.
See for example <Documentation/arch/x86/x86_64/boot-options.rst>.

Note that ALL kernel parameters listed below are CASE SENSITIVE, and that
a trailing = on the name of any parameter states that that parameter will
Expand Down
Loading

0 comments on commit c23f289

Please sign in to comment.