Commit 8f71a2b3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull documentation fixes from Jonathan Corbet:
 "Four small fixes for the docs tree"

* tag 'docs-6.1-fixes' of git://git.lwn.net/linux:
  docs/process/howto: Replace C89 with C11
  Documentation: Fix spelling mistake in hacking.rst
  Documentation: process: replace outdated LTS table w/ link
  tracing/histogram: Update document for KEYS_MAX size
parents 6eafb4a1 2f3f53d6

Documentation/kernel-hacking/hacking.rst

+1 −1
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ You can tell you are in a softirq (or tasklet) using the 
.. warning::



    Beware that this will return a false positive if a

    :ref:`botton half lock <local_bh_disable>` is held.

    :ref:`bottom half lock <local_bh_disable>` is held.



Some Basic Rules

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

Documentation/process/2.Process.rst

+4 −11
Original line number Diff line number Diff line
@@ -126,17 +126,10 @@ than one development cycle past their initial release. So, for example, the 
5.2.21 was the final stable update of the 5.2 release.



Some kernels are designated "long term" kernels; they will receive support

for a longer period.  As of this writing, the current long term kernels

and their maintainers are:



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

	3.16	Ben Hutchings				(very long-term kernel)

	4.4	Greg Kroah-Hartman & Sasha Levin	(very long-term kernel)

	4.9	Greg Kroah-Hartman & Sasha Levin

	4.14	Greg Kroah-Hartman & Sasha Levin

	4.19	Greg Kroah-Hartman & Sasha Levin

	5.4	Greg Kroah-Hartman & Sasha Levin

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

for a longer period.  Please refer to the following link for the list of active

long term kernel versions and their maintainers:



	https://www.kernel.org/category/releases.html



The selection of a kernel for long-term support is purely a matter of a

maintainer having the need and the time to maintain that release.  There

Documentation/process/howto.rst

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ experience, the following books are good for, if anything, reference: 
 - "C:  A Reference Manual" by Harbison and Steele [Prentice Hall]



The kernel is written using GNU C and the GNU toolchain.  While it

adheres to the ISO C89 standard, it uses a number of extensions that are

adheres to the ISO C11 standard, it uses a number of extensions that are

not featured in the standard.  The kernel is a freestanding C

environment, with no reliance on the standard C library, so some

portions of the C standard are not supported.  Arbitrary long long

Documentation/trace/histogram.rst

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ Documentation written by Tom Zanussi 
  will use the event's kernel stacktrace as the key.  The keywords

  'keys' or 'key' can be used to specify keys, and the keywords

  'values', 'vals', or 'val' can be used to specify values.  Compound

  keys consisting of up to two fields can be specified by the 'keys'

  keys consisting of up to three fields can be specified by the 'keys'

  keyword.  Hashing a compound key produces a unique entry in the

  table for each unique combination of component keys, and can be

  useful for providing more fine-grained summaries of event data.

Documentation/translations/it_IT/process/howto.rst

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ altro, utili riferimenti: 
- "C:  A Reference Manual" di Harbison and Steele [Prentice Hall]



Il kernel è stato scritto usando GNU C e la toolchain GNU.

Sebbene si attenga allo standard ISO C89, esso utilizza una serie di

Sebbene si attenga allo standard ISO C11, esso utilizza una serie di

estensioni che non sono previste in questo standard. Il kernel è un

ambiente C indipendente, che non ha alcuna dipendenza dalle librerie

C standard, così alcune parti del C standard non sono supportate.