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

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

Pull documentation updates from Jonathan Corbet:
 "There's not a huge amount of activity in the docs tree this time
  around, but a few significant changes even so:

   - A complete rewriting of the top-level index.rst file, which mostly
     reflects itself in a redone top page in the HTML-rendered docs. The
     hope is that the new organization will be a friendlier starting
     point for both users and developers.

   - Some math-rendering improvements.

   - A coding-style.rst update on the use of BUG() and WARN()

   - A big maintainer-PHP guide update.

   - Some code-of-conduct updates

   - More Chinese translation work

  Plus the usual pile of typo fixes, corrections, and updates"

* tag 'docs-6.1' of git://git.lwn.net/linux: (66 commits)
  checkpatch: warn on usage of VM_BUG_ON() and other BUG variants
  coding-style.rst: document BUG() and WARN() rules ("do not crash the kernel")
  Documentation: devres: add missing IO helper
  Documentation: devres: update IRQ helper
  Documentation/mm: modify page_referenced to folio_referenced
  Documentation/CoC: Reflect current CoC interpretation and practices
  docs/doc-guide: Add documentation on SPHINX_IMGMATH
  docs: process/5.Posting.rst: clarify use of Reported-by: tag
  docs, kprobes: Fix the wrong location of Kprobes
  docs: add a man-pages link to the front page
  docs: put atomic*.txt and memory-barriers.txt into the core-api book
  docs: move asm-annotations.rst into core-api
  docs: remove some index.rst cruft
  docs: reconfigure the HTML left column
  docs: Rewrite the front page
  docs: promote the title of process/index.rst
  Documentation: devres: add missing SPI helper
  Documentation: devres: add missing PINCTRL helpers
  docs: hugetlbpage.rst: fix a typo of hugepage size
  docs/zh_CN: Add new translation of admin-guide/bootconfig.rst
  ...
parents 890f2420 69d517e6
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ Date: May 2011
KernelVersion:	3.0
Contact:	Rafał Miłecki <zajec5@gmail.com>
Description:
		Each BCMA core has it's manufacturer id. See
		Each BCMA core has its manufacturer id. See
		include/linux/bcma/bcma.h for possible values.

What:		/sys/bus/bcma/devices/.../id
+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ Description: 'FCoE Controller' instances on the fcoe bus.
		1) Write interface name to ctlr_create 2) Configure the FCoE
		Controller (ctlr_X) 3) Enable the FCoE Controller to begin
		discovery and login. The FCoE Controller is destroyed by
		writing it's name, i.e. ctlr_X to the ctlr_delete file.
		writing its name, i.e. ctlr_X to the ctlr_delete file.

Attributes:

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ Description:
		on the signal from which time of flight measurements are
		taken.
		The appropriate values to take is dependent on both the
		sensor and it's operating environment:
		sensor and its operating environment:
		* as3935 (0-31 range)
		18 = indoors (default)
		14 = outdoors
+1 −1
Original line number Diff line number Diff line
@@ -296,7 +296,7 @@ Description: Processor frequency boosting control

		This switch controls the boost setting for the whole system.
		Boosting allows the CPU and the firmware to run at a frequency
		beyond it's nominal limit.
		beyond its nominal limit.

		More details can be found in
		Documentation/admin-guide/pm/cpufreq.rst
+3 −3
Original line number Diff line number Diff line
@@ -2,8 +2,8 @@ What: /sys/bus/platform/devices/ci_hdrc.0/role
Date:		Mar 2017
Contact:	Peter Chen <peter.chen@nxp.com>
Description:
		It returns string "gadget" or "host" when read it, it indicates
		current controller role.
		When read, it returns string "gadget" or "host", indicating
		the current controller role.

		It will do role switch when write "gadget" or "host" to it.
		It will do role switch when "gadget" or "host" is written to it.
		Only controller at dual-role configuration supports writing.
Loading