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

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

Pull Documentation fixes from Jonathan Corbet:
 "A handful of late-arriving fixes for the documentation tree"

* tag 'docs-5.7-2' of git://git.lwn.net/linux:
  Documentation: android: binderfs: add 'stats' mount option
  Documentation: driver-api/usb/writing_usb_driver.rst Updates documentation links
  docs: driver-api: address duplicate label warning
  Documentation: sysrq: fix RST formatting
  docs: kernel-parameters.txt: Fix broken references
  docs: kernel-parameters.txt: Remove nompx
  docs: filesystems: fix typo in qnx6.rst
parents 4e4bdcfa befacdcf

Documentation/admin-guide/binderfs.rst

+6 −0
Original line number Diff line number Diff line
@@ -33,6 +33,12 @@ max 
  a per-instance limit. If ``max=<count>`` is set then only ``<count>`` number

  of binder devices can be allocated in this binderfs instance.



stats

  Using ``stats=global`` enables global binder statistics.

  ``stats=global`` is only available for a binderfs instance mounted in the

  initial user namespace. An attempt to use the option to mount a binderfs

  instance in another user namespace will return a permission error.



Allocating binder Devices

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

Documentation/admin-guide/kernel-parameters.txt

+2 −6
Original line number Diff line number Diff line
@@ -685,7 +685,7 @@ 
	coredump_filter=

			[KNL] Change the default value for

			/proc/<pid>/coredump_filter.

			See also Documentation/filesystems/proc.txt.

			See also Documentation/filesystems/proc.rst.



	coresight_cpu_debug.enable

			[ARM,ARM64]
@@ -962,7 +962,7 @@ 
			edid/1680x1050.bin, or edid/1920x1080.bin is given

			and no file with the same name exists. Details and

			instructions how to build your own EDID data are

			available in Documentation/driver-api/edid.rst. An EDID

			available in Documentation/admin-guide/edid.rst. An EDID

			data set will only be used for a particular connector,

			if its name and a colon are prepended to the EDID

			name. Each connector may use a unique EDID data
@@ -992,10 +992,6 @@ 
			Documentation/admin-guide/dynamic-debug-howto.rst

			for details.



	nompx		[X86] Disables Intel Memory Protection Extensions.

			See Documentation/x86/intel_mpx.rst for more

			information about the feature.



	nopku		[X86] Disable Memory Protection Keys CPU feature found

			in some Intel CPUs.

Documentation/admin-guide/sysrq.rst

+11 −9
Original line number Diff line number Diff line
@@ -48,7 +48,8 @@ always allowed (by a user with admin privileges). 
How do I use the magic SysRq key?

~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~



On x86   - You press the key combo :kbd:`ALT-SysRq-<command key>`.

On x86

	You press the key combo :kbd:`ALT-SysRq-<command key>`.



	.. note::

	   Some
@@ -58,14 +59,15 @@ On x86 - You press the key combo :kbd:`ALT-SysRq-<command key>`. 
	   have better luck with press :kbd:`Alt`, press :kbd:`SysRq`,

	   release :kbd:`SysRq`, press :kbd:`<command key>`, release everything.



On SPARC - You press :kbd:`ALT-STOP-<command key>`, I believe.

On SPARC

	You press :kbd:`ALT-STOP-<command key>`, I believe.



On the serial console (PC style standard serial ports only)

        You send a ``BREAK``, then within 5 seconds a command key. Sending

        ``BREAK`` twice is interpreted as a normal BREAK.



On PowerPC

	Press :kbd:`ALT - Print Screen` (or :kbd:`F13`) - :kbd:`<command key>`,

	Press :kbd:`ALT - Print Screen` (or :kbd:`F13`) - :kbd:`<command key>`.

        :kbd:`Print Screen` (or :kbd:`F13`) - :kbd:`<command key>` may suffice.



On other
@@ -73,7 +75,7 @@ On other 
        let me know so I can add them to this section.



On all

	write a character to /proc/sysrq-trigger.  e.g.::

	Write a character to /proc/sysrq-trigger.  e.g.::



		echo t > /proc/sysrq-trigger
@@ -282,7 +284,7 @@ Just ask them on the linux-kernel mailing list: 
Credits

~~~~~~~



Written by Mydraal <vulpyne@vulpyne.net>

Updated by Adam Sulmicki <adam@cfar.umd.edu>

Updated by Jeremy M. Dolan <jmd@turbogeek.org> 2001/01/28 10:15:59

Added to by Crutcher Dunnavant <crutcher+kernel@datastacks.com>
 
- Written by Mydraal <vulpyne@vulpyne.net>

- Updated by Adam Sulmicki <adam@cfar.umd.edu>

- Updated by Jeremy M. Dolan <jmd@turbogeek.org> 2001/01/28 10:15:59

- Added to by Crutcher Dunnavant <crutcher+kernel@datastacks.com>

Documentation/driver-api/usb/writing_usb_driver.rst

+2 −5
Original line number Diff line number Diff line
@@ -314,11 +314,8 @@ http://www.linux-usb.org/ 
Linux Hotplug Project:

http://linux-hotplug.sourceforge.net/



Linux USB Working Devices List:

http://www.qbik.ch/usb/devices/



linux-usb-devel Mailing List Archives:

http://marc.theaimsgroup.com/?l=linux-usb-devel

linux-usb Mailing List Archives:

https://lore.kernel.org/linux-usb/



Programming Guide for Linux USB Device Drivers:

http://lmu.web.psi.ch/docu/manuals/software_manuals/linux_sl/usb_linux_programming_guide.pdf

Documentation/driver-api/w1.rst

+0 −3
Original line number Diff line number Diff line
@@ -7,9 +7,6 @@ W1: Dallas' 1-wire bus 
W1 API internal to the kernel

=============================



W1 API internal to the kernel

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



include/linux/w1.h

~~~~~~~~~~~~~~~~~~

CRA Git | Maintained and supported by SUSTech CRA and CCSE