Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

Pull documentation updates from Jonathan Corbet:
 "There's been a fair amount of work in the docs tree this time around,
  including:

   - Extensive RST conversions and organizational work in the
     memory-management docs thanks to Mike Rapoport.

   - An update of Documentation/features from Andrea Parri and a script
     to keep it updated.

   - Various LICENSES updates from Thomas, along with a script to check
     SPDX tags.

   - Work to fix dangling references to documentation files; this
     involved a fair number of one-liner comment changes outside of
     Documentation/

  ... and the usual list of documentation improvements, typo fixes, etc"

* tag 'docs-4.18' of git://git.lwn.net/linux: (103 commits)
  Documentation: document hung_task_panic kernel parameter
  docs/admin-guide/mm: add high level concepts overview
  docs/vm: move ksm and transhuge from "user" to "internals" section.
  docs: Use the kerneldoc comments for memalloc_no*()
  doc: document scope NOFS, NOIO APIs
  docs: update kernel versions and dates in tables
  docs/vm: transhuge: split userspace bits to admin-guide/mm/transhuge
  docs/vm: transhuge: minor updates
  docs/vm: transhuge: change sections order
  Documentation: arm: clean up Marvell Berlin family info
  Documentation: gpio: driver: Fix a typo and some odd grammar
  docs: ranoops.rst: fix location of ramoops.txt
  scripts/documentation-file-ref-check: rewrite it in perl with auto-fix mode
  docs: uio-howto.rst: use a code block to solve a warning
  mm, THP, doc: Add document for thp_swpout/thp_swpout_fallback
  w1: w1_io.c: fix a kernel-doc warning
  Documentation/process/posting: wrap text at 80 cols
  docs: admin-guide: add cgroup-v2 documentation
  Revert "Documentation/features/vm: Remove arch support status file for 'pte_special'"
  Documentation: refcount-vs-atomic: Update reference to LKMM doc.
  ...
parents c5e7a7ea a49d9c0a
Loading
Loading
Loading
Loading
+0 −10
Original line number Diff line number Diff line
@@ -64,8 +64,6 @@ auxdisplay/
	- misc. LCD driver documentation (cfag12864b, ks0108).
backlight/
	- directory with info on controlling backlights in flat panel displays
bcache.txt
	- Block-layer cache on fast SSDs to improve slow (raid) I/O performance.
block/
	- info on the Block I/O (BIO) layer.
blockdev/
@@ -78,18 +76,10 @@ bus-devices/
	- directory with info on TI GPMC (General Purpose Memory Controller)
bus-virt-phys-mapping.txt
	- how to access I/O mapped memory from within device drivers.
cachetlb.txt
	- describes the cache/TLB flushing interfaces Linux uses.
cdrom/
	- directory with information on the CD-ROM drivers that Linux has.
cgroup-v1/
	- cgroups v1 features, including cpusets and memory controller.
cgroup-v2.txt
	- cgroups v2 features, including cpusets and memory controller.
circular-buffers.txt
	- how to make use of the existing circular buffer infrastructure
clk.txt
	- info on the common clock framework
cma/
	- Continuous Memory Area (CMA) debugfs interface.
conf.py
+1 −1
Original line number Diff line number Diff line
@@ -90,4 +90,4 @@ Date: December 2009
Contact:	Lee Schermerhorn <lee.schermerhorn@hp.com>
Description:
		The node's huge page size control/query attributes.
		See Documentation/vm/hugetlbpage.txt
 No newline at end of file
		See Documentation/admin-guide/mm/hugetlbpage.rst
 No newline at end of file
+1 −1
Original line number Diff line number Diff line
@@ -12,4 +12,4 @@ Description:
			free_hugepages
			surplus_hugepages
			resv_hugepages
		See Documentation/vm/hugetlbpage.txt for details.
		See Documentation/admin-guide/mm/hugetlbpage.rst for details.
+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ Description: Kernel Samepage Merging daemon sysfs interface
		sleep_millisecs: how many milliseconds ksm should sleep between
		scans.

		See Documentation/vm/ksm.txt for more information.
		See Documentation/vm/ksm.rst for more information.

What:		/sys/kernel/mm/ksm/merge_across_nodes
Date:		January 2013
+2 −2
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ Description:
		The alloc_calls file is read-only and lists the kernel code
		locations from which allocations for this cache were performed.
		The alloc_calls file only contains information if debugging is
		enabled for that cache (see Documentation/vm/slub.txt).
		enabled for that cache (see Documentation/vm/slub.rst).

What:		/sys/kernel/slab/cache/alloc_fastpath
Date:		February 2008
@@ -219,7 +219,7 @@ Contact: Pekka Enberg <penberg@cs.helsinki.fi>,
Description:
		The free_calls file is read-only and lists the locations of
		object frees if slab debugging is enabled (see
		Documentation/vm/slub.txt).
		Documentation/vm/slub.rst).

What:		/sys/kernel/slab/cache/free_fastpath
Date:		February 2008
Loading