Commit 8815da98 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull documentation updates from Jonathan Corbet:
 "Another not-too-busy cycle for documentation, including:

   - Some build-system changes to detect the variable fonts installed by
     some distributions that can break the PDF build.

   - Various updates and additions to the Spanish, Chinese, Italian, and
     Japanese translations.

   - Update the stable-kernel rules to match modern practice

  ... and the usual array of corrections, updates, and typo fixes"

* tag 'docs-6.10' of git://git.lwn.net/linux: (42 commits)
  cgroup: Add documentation for missing zswap memory.stat
  kernel-doc: Added "*" in $type_constants2 to fix 'make htmldocs' warning.
  docs:core-api: fixed typos and grammar in printk-index page
  Documentation: tracing: Fix spelling mistakes
  docs/zh_CN/rust: Update the translation of quick-start to 6.9-rc4
  docs/zh_CN/rust: Update the translation of general-information to 6.9-rc4
  docs/zh_CN/rust: Update the translation of coding-guidelines to 6.9-rc4
  docs/zh_CN/rust: Update the translation of arch-support to 6.9-rc4
  docs: stable-kernel-rules: fix typo sent->send
  docs/zh_CN: remove two inconsistent spaces
  docs: scripts/check-variable-fonts.sh: Improve commands for detection
  docs: stable-kernel-rules: create special tag to flag 'no backporting'
  docs: stable-kernel-rules: explain use of stable@kernel.org (w/o @vger.)
  docs: stable-kernel-rules: remove code-labels tags and a indention level
  docs: stable-kernel-rules: call mainline by its name and change example
  docs: stable-kernel-rules: reduce redundancy
  docs, kprobes: Add riscv as supported architecture
  Docs: typos/spelling
  docs: kernel_include.py: Cope with docutils 0.21
  docs: ja_JP/howto: Catch up update in v6.8
  ...
parents 25c73642 db5b4f32

.mailmap

+1 −0
Original line number Diff line number Diff line
@@ -133,6 +133,7 @@ Bryan Tan <bryan-bt.tan@broadcom.com> <bryantan@vmware.com> 
Cai Huoqing <cai.huoqing@linux.dev> <caihuoqing@baidu.com>

Can Guo <quic_cang@quicinc.com> <cang@codeaurora.org>

Carl Huang <quic_cjhuang@quicinc.com> <cjhuang@codeaurora.org>

Carlos Bilbao <carlos.bilbao.osdev@gmail.com> <carlos.bilbao@amd.com>

Changbin Du <changbin.du@intel.com> <changbin.du@gmail.com>

Changbin Du <changbin.du@intel.com> <changbin.du@intel.com>

Chao Yu <chao@kernel.org> <chao2.yu@samsung.com>

Documentation/Makefile

+6 −1
Original line number Diff line number Diff line
@@ -28,6 +28,10 @@ BUILDDIR = $(obj)/output 
PDFLATEX      = xelatex

LATEXOPTS     = -interaction=batchmode -no-shell-escape



# For denylisting "variable font" files

# Can be overridden by setting as an env variable

FONTS_CONF_DENY_VF ?= $(HOME)/deny-vf



ifeq ($(findstring 1, $(KBUILD_VERBOSE)),)

SPHINXOPTS    += "-q"

endif
@@ -151,10 +155,11 @@ pdfdocs: 


else # HAVE_PDFLATEX



pdfdocs: DENY_VF = XDG_CONFIG_HOME=$(FONTS_CONF_DENY_VF)

pdfdocs: latexdocs

	@$(srctree)/scripts/sphinx-pre-install --version-check

	$(foreach var,$(SPHINXDIRS), \

	   $(MAKE) PDFLATEX="$(PDFLATEX)" LATEXOPTS="$(LATEXOPTS)" -C $(BUILDDIR)/$(var)/latex || exit; \

	   $(MAKE) PDFLATEX="$(PDFLATEX)" LATEXOPTS="$(LATEXOPTS)" $(DENY_VF) -C $(BUILDDIR)/$(var)/latex || sh $(srctree)/scripts/check-variable-fonts.sh || exit; \

	   mkdir -p $(BUILDDIR)/$(var)/pdf; \

	   mv $(subst .tex,.pdf,$(wildcard $(BUILDDIR)/$(var)/latex/*.tex)) $(BUILDDIR)/$(var)/pdf/; \

	)

Documentation/admin-guide/cgroup-v2.rst

+9 −0
Original line number Diff line number Diff line
@@ -1572,6 +1572,15 @@ PAGE_SIZE multiple when read back. 
	  pglazyfreed (npn)

		Amount of reclaimed lazyfree pages



	  zswpin

		Number of pages moved in to memory from zswap.



	  zswpout

		Number of pages moved out of memory to zswap.



	  zswpwb

		Number of pages written from zswap to swap.



	  thp_fault_alloc (npn)

		Number of transparent hugepages which were allocated to satisfy

		a page fault. This counter is not present when CONFIG_TRANSPARENT_HUGEPAGE

Documentation/admin-guide/hw-vuln/core-scheduling.rst

+2 −2
Original line number Diff line number Diff line
@@ -67,8 +67,8 @@ arg4: 
    will be performed for all tasks in the task group of ``pid``.



arg5:

    userspace pointer to an unsigned long for storing the cookie returned by

    ``PR_SCHED_CORE_GET`` command. Should be 0 for all other commands.

    userspace pointer to an unsigned long long for storing the cookie returned

    by ``PR_SCHED_CORE_GET`` command. Should be 0 for all other commands.



In order for a process to push a cookie to, or pull a cookie from a process, it

is required to have the ptrace access mode: `PTRACE_MODE_READ_REALCREDS` to the

Documentation/admin-guide/hw-vuln/srso.rst

+1 −1
Original line number Diff line number Diff line
@@ -135,7 +135,7 @@ and does not want to suffer the performance impact, one can always 
disable the mitigation with spec_rstack_overflow=off.



Similarly, 'Mitigation: IBPB' is another full mitigation type employing

an indrect branch prediction barrier after having applied the required

an indirect branch prediction barrier after having applied the required

microcode patch for one's system. This mitigation comes also at

a performance cost.