Commit fbeb229a authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 



No conflicts.

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents d9095f92 9521c9d6

Documentation/ABI/testing/sysfs-kernel-mm-memory-tiers

+2 −2
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ Description: A collection of all the memory tiers allocated. 




What:		/sys/devices/virtual/memory_tiering/memory_tierN/

		/sys/devices/virtual/memory_tiering/memory_tierN/nodes

		/sys/devices/virtual/memory_tiering/memory_tierN/nodelist

Date:		August 2022

Contact:	Linux memory management mailing list <linux-mm@kvack.org>

Description:	Directory with details of a specific memory tier
@@ -21,5 +21,5 @@ Description: Directory with details of a specific memory tier 
		A smaller value of N implies a higher (faster) memory tier in the

		hierarchy.



		nodes: NUMA nodes that are part of this memory tier.

		nodelist: NUMA nodes that are part of this memory tier.

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.