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

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

Pull documentation updates from Jonathan Corbet:
 "The number of commits for documentation is not huge this time around,
  but there are some significant changes nonetheless:

   - Some more Spanish-language and Chinese translations

   - The much-discussed documentation of the confidential-computing
     threat model

   - Powerpc and RISCV documentation move under Documentation/arch -
     these complete this particular bit of documentation churn

   - A large traditional-Chinese documentation update

   - A new document on backporting and conflict resolution

   - Some kernel-doc and Sphinx fixes

  Plus the usual smattering of smaller updates and typo fixes"

* tag 'docs-6.7' of git://git.lwn.net/linux: (40 commits)
  scripts/kernel-doc: Fix the regex for matching -Werror flag
  docs: backporting: address feedback
  Documentation: driver-api: pps: Update PPS generator documentation
  speakup: Document USB support
  doc: blk-ioprio: Bring the doc in line with the implementation
  docs: usb: fix reference to nonexistent file in UVC Gadget
  docs: doc-guide: mention 'make refcheckdocs'
  Documentation: fix typo in dynamic-debug howto
  scripts/kernel-doc: match -Werror flag strictly
  Documentation/sphinx: Remove the repeated word "the" in comments.
  docs: sparse: add SPDX-License-Identifier
  docs/zh_CN: Add subsystem-apis Chinese translation
  docs/zh_TW: update contents for zh_TW
  docs: submitting-patches: encourage direct notifications to commenters
  docs: add backporting and conflict resolution document
  docs: move riscv under arch
  docs: update link to powerpc/vmemmap_dedup.rst
  mm/memory-hotplug: fix typo in documentation
  docs: move powerpc under arch
  PCI: Update the devres documentation regarding to pcim_*()
  ...
parents 7dc0e9c7 cf63348b

Documentation/ABI/testing/sysfs-bus-papr-pmem

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ Description: 
		more bits set in the dimm-health-bitmap retrieved in

		response to H_SCM_HEALTH hcall. The details of the bit

		flags returned in response to this hcall is available

		at 'Documentation/powerpc/papr_hcalls.rst' . Below are

		at 'Documentation/arch/powerpc/papr_hcalls.rst' . Below are

		the flags reported in this sysfs file:



		* "not_armed"

Documentation/PCI/pci-error-recovery.rst

+2 −2
Original line number Diff line number Diff line
@@ -364,7 +364,7 @@ Note, however, not all failures are truly "permanent". Some are 
caused by over-heating, some by a poorly seated card. Many

PCI error events are caused by software bugs, e.g. DMAs to

wild addresses or bogus split transactions due to programming

errors. See the discussion in Documentation/powerpc/eeh-pci-error-recovery.rst

errors. See the discussion in Documentation/arch/powerpc/eeh-pci-error-recovery.rst

for additional detail on real-life experience of the causes of

software errors.
@@ -404,7 +404,7 @@ That is, the recovery API only requires that: 
.. note::



   Implementation details for the powerpc platform are discussed in

   the file Documentation/powerpc/eeh-pci-error-recovery.rst

   the file Documentation/arch/powerpc/eeh-pci-error-recovery.rst



   As of this writing, there is a growing list of device drivers with

   patches implementing error recovery. Not all of these patches are in

Documentation/admin-guide/cgroup-v2.rst

+6 −4
Original line number Diff line number Diff line
@@ -2030,7 +2030,7 @@ IO Priority 
~~~~~~~~~~~



A single attribute controls the behavior of the I/O priority cgroup policy,

namely the blkio.prio.class attribute. The following values are accepted for

namely the io.prio.class attribute. The following values are accepted for

that attribute:



  no-change
@@ -2059,9 +2059,11 @@ The following numerical values are associated with the I/O priority policies: 
+----------------+---+

| no-change      | 0 |

+----------------+---+

| rt-to-be       | 2 |

| promote-to-rt  | 1 |

+----------------+---+

| all-to-idle    | 3 |

| restrict-to-be | 2 |

+----------------+---+

| idle           | 3 |

+----------------+---+



The numerical value that corresponds to each I/O priority class is as follows:
@@ -2081,7 +2083,7 @@ The algorithm to set the I/O priority class for a request is as follows: 
- If I/O priority class policy is promote-to-rt, change the request I/O

  priority class to IOPRIO_CLASS_RT and change the request I/O priority

  level to 4.

- If I/O priorityt class is not promote-to-rt, translate the I/O priority

- If I/O priority class policy is not promote-to-rt, translate the I/O priority

  class policy into a number, then change the request I/O priority class

  into the maximum of the I/O priority class policy number and the numerical

  I/O priority class.

Documentation/admin-guide/dynamic-debug-howto.rst

+1 −1
Original line number Diff line number Diff line
@@ -259,7 +259,7 @@ Debug Messages at Module Initialization Time 


When ``modprobe foo`` is called, modprobe scans ``/proc/cmdline`` for

``foo.params``, strips ``foo.``, and passes them to the kernel along with

params given in modprobe args or ``/etc/modprob.d/*.conf`` files,

params given in modprobe args or ``/etc/modprobe.d/*.conf`` files,

in the following order:



1. parameters given via ``/etc/modprobe.d/*.conf``::

Documentation/admin-guide/efi-stub.rst

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ between architectures is in drivers/firmware/efi/libstub. 


For arm64, there is no compressed kernel support, so the Image itself

masquerades as a PE/COFF image and the EFI stub is linked into the

kernel. The arm64 EFI stub lives in arch/arm64/kernel/efi-entry.S

kernel. The arm64 EFI stub lives in drivers/firmware/efi/libstub/arm64.c

and drivers/firmware/efi/libstub/arm64-stub.c.



By using the EFI boot stub it's possible to boot a Linux kernel