Commit d0f93ac2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull Documentation updates from Jonathan Corbet:

 - Quite a bit of Chinese and Spanish translation work

 - Clarifying that Git commit IDs >12chars are OK

 - A new nvme-multipath document

 - A reorganization of the admin-guide top-level page to make it
   readable

 - Clarification of the role of Acked-by and maintainer discretion on
   their acceptance

 - Some reorganization of debugging-oriented docs

... and typo fixes, documentation updates, etc as usual

* tag 'docs-6.14' of git://git.lwn.net/linux: (50 commits)
  Documentation: Fix x86_64 UEFI outdated references to elilo
  Documentation/sysctl: Add timer_migration to kernel.rst
  docs/mm: Physical memory: Remove zone_t
  docs: submitting-patches: clarify that signers may use their discretion on tags
  docs: submitting-patches: clarify difference between Acked-by and Reviewed-by
  docs: submitting-patches: clarify Acked-by and introduce "# Suffix"
  Documentation: bug-hunting.rst: remove odd contact information
  docs/zh_CN: Add sak index Chinese translation
  doc: module: DEFAULT_SYMBOL_NAMESPACE must be defined before #includes
  doc: module: Fix documented type of namespace
  Documentation/kernel-parameters: Fix a reference to vga-softcursor.rst
  docs/zh_CN: Add landlock index Chinese translation
  Documentation: Fix typo localmodonfig -> localmodconfig
  overlayfs.rst: Fix and improve grammar
  docs/zh_CN: Add siphash index Chinese translation
  docs/zh_CN: Add security IMA-templates Chinese translation
  docs/zh_CN: Add security digsig Chinese translation
  Align git commit ID abbreviation guidelines and checks
  docs: process: submitting-patches: split canonical patch format section
  docs/zh_CN: Add security lsm Chinese translation
  ...
parents e3610441 6912bdb7

Documentation/accounting/taskstats-struct.rst

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ should not change the relative position of each field within the struct. 
1) Common and basic accounting fields::



	/* The version number of this struct. This field is always set to

	 * TAKSTATS_VERSION, which is defined in <linux/taskstats.h>.

	 * TASKSTATS_VERSION, which is defined in <linux/taskstats.h>.

	 * Each time the struct is changed, the value should be incremented.

	 */

	__u16	version;

Documentation/admin-guide/README.rst

+2 −2
Original line number Diff line number Diff line
@@ -356,5 +356,5 @@ instructions at 'Documentation/admin-guide/reporting-issues.rst'. 


Hints on understanding kernel bug reports are in

'Documentation/admin-guide/bug-hunting.rst'. More on debugging the kernel

with gdb is in 'Documentation/dev-tools/gdb-kernel-debugging.rst' and

'Documentation/dev-tools/kgdb.rst'.
 
with gdb is in 'Documentation/process/debugging/gdb-kernel-debugging.rst' and

'Documentation/process/debugging/kgdb.rst'.

Documentation/admin-guide/blockdev/zram.rst

+3 −3
Original line number Diff line number Diff line
@@ -121,14 +121,14 @@ compression algorithm to use external pre-trained dictionary, pass full 
path to the `dict` along with other parameters::



	#pass path to pre-trained zstd dictionary

	echo "algo=zstd dict=/etc/dictioary" > /sys/block/zram0/algorithm_params

	echo "algo=zstd dict=/etc/dictionary" > /sys/block/zram0/algorithm_params



	#same, but using algorithm priority

	echo "priority=1 dict=/etc/dictioary" > \

	echo "priority=1 dict=/etc/dictionary" > \

		/sys/block/zram0/algorithm_params



	#pass path to pre-trained zstd dictionary and compression level

	echo "algo=zstd level=8 dict=/etc/dictioary" > \

	echo "algo=zstd level=8 dict=/etc/dictionary" > \

		/sys/block/zram0/algorithm_params



Parameters are algorithm specific: not all algorithms support pre-trained

Documentation/admin-guide/braille-console.rst

+2 −2
Original line number Diff line number Diff line
@@ -21,8 +21,8 @@ override the baud rate to 115200, etc. 
By default, the braille device will just show the last kernel message (console

mode).  To review previous messages, press the Insert key to switch to the VT

review mode.  In review mode, the arrow keys permit to browse in the VT content,

:kbd:`PAGE-UP`/:kbd:`PAGE-DOWN` keys go at the top/bottom of the screen, and

the :kbd:`HOME` key goes back

`PAGE-UP`/`PAGE-DOWN` keys go at the top/bottom of the screen, and

the `HOME` key goes back

to the cursor, hence providing very basic screen reviewing facility.



Sound feedback can be obtained by adding the ``braille_console.sound=1`` kernel

Documentation/admin-guide/bug-hunting.rst

+0 −9
Original line number Diff line number Diff line
@@ -368,12 +368,3 @@ processed by ``klogd``:: 
	Aug 29 09:51:01 blizard kernel: Call Trace: [oops:_oops_ioctl+48/80] [_sys_ioctl+254/272] [_system_call+82/128]

	Aug 29 09:51:01 blizard kernel: Code: c7 00 05 00 00 00 eb 08 90 90 90 90 90 90 90 90 89 ec 5d c3

---------------------------------------------------------------------------



::



  Dr. G.W. Wettstein           Oncology Research Div. Computing Facility

  Roger Maris Cancer Center    INTERNET: greg@wind.rmcc.com

  820 4th St. N.

  Fargo, ND  58122

  Phone: 701-234-7556