Commit 4979bf86 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull documentation fixes from Jonathan Corbet:
 "A handful of fixes and minor documentation updates"

* tag 'docs-6.3-fixes' of git://git.lwn.net/linux:
  docs: vfio: fix header path
  docs: process: typo fix
  docs/mm: hugetlbfs_reserv: fix a reference to a file that doesn't exist
  docs/mm: Physical Memory: fix a reference to a file that doesn't exist
  docs: rebasing-and-merging: Drop wrong statement about git
  docs: programming-language: add Rust programming language section
  docs: programming-language: remove mention of the Intel compiler
  docs: Correct missing "d_" prefix for dentry_operations member d_weak_revalidate
  sched/doc: supplement CPU capacity with RISC-V
parents fc89d7fb d7ba3657

Documentation/driver-api/vfio.rst

+1 −1
Original line number Diff line number Diff line
@@ -242,7 +242,7 @@ group and can access them as follows:: 
VFIO User API

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



Please see include/linux/vfio.h for complete API documentation.

Please see include/uapi/linux/vfio.h for complete API documentation.



VFIO bus driver API

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

Documentation/filesystems/vfs.rst

+1 −1
Original line number Diff line number Diff line
@@ -1222,7 +1222,7 @@ defined: 
	return

	-ECHILD and it will be called again in ref-walk mode.



``_weak_revalidate``

``d_weak_revalidate``

	called when the VFS needs to revalidate a "jumped" dentry.  This

	is called when a path-walk ends at dentry that was not acquired

	by doing a lookup in the parent directory.  This includes "/",

Documentation/maintainer/rebasing-and-merging.rst

+1 −5
Original line number Diff line number Diff line
@@ -213,11 +213,7 @@ point rather than some random spot. If your upstream-bound branch has 
emptied entirely into the mainline during the merge window, you can pull it

forward with a command like::



  git merge v5.2-rc1^0



The "^0" will cause Git to do a fast-forward merge (which should be

possible in this situation), thus avoiding the addition of a spurious merge

commit.

  git merge --ff-only v5.2-rc1



The guidelines laid out above are just that: guidelines.  There will always

be situations that call out for a different solution, and these guidelines

Documentation/mm/hugetlbfs_reserv.rst

+4 −4
Original line number Diff line number Diff line
@@ -5,10 +5,10 @@ Hugetlbfs Reservation 
Overview

========



Huge pages as described at Documentation/mm/hugetlbpage.rst are typically

preallocated for application use.  These huge pages are instantiated in a

task's address space at page fault time if the VMA indicates huge pages are

to be used.  If no huge page exists at page fault time, the task is sent

Huge pages as described at Documentation/admin-guide/mm/hugetlbpage.rst are

typically preallocated for application use.  These huge pages are instantiated

in a task's address space at page fault time if the VMA indicates huge pages

are to be used.  If no huge page exists at page fault time, the task is sent

a SIGBUS and often dies an unhappy death.  Shortly after huge page support

was added, it was determined that it would be better to detect a shortage

of huge pages at mmap() time.  The idea is that if there were not enough

Documentation/mm/physical_memory.rst

+1 −1
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ one of the types described below. 
  also populated on boot using one of ``kernelcore``, ``movablecore`` and

  ``movable_node`` kernel command line parameters. See

  Documentation/mm/page_migration.rst and

  Documentation/admin-guide/mm/memory_hotplug.rst for additional details.

  Documentation/admin-guide/mm/memory-hotplug.rst for additional details.



* ``ZONE_DEVICE`` represents memory residing on devices such as PMEM and GPU.

  It has different characteristics than RAM zone types and it exists to provide