Skip to content

Commit

Permalink
Merge tag 'docs-5.7-2' of git://git.lwn.net/linux
Browse files Browse the repository at this point in the history
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
  • Loading branch information
torvalds committed Apr 11, 2020
2 parents 4e4bdcf + befacdc commit ca6151a
Show file tree
Hide file tree
Showing 6 changed files with 22 additions and 24 deletions.
6 changes: 6 additions & 0 deletions Documentation/admin-guide/binderfs.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
-------------------------

Expand Down
8 changes: 2 additions & 6 deletions Documentation/admin-guide/kernel-parameters.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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.

Expand Down
20 changes: 11 additions & 9 deletions Documentation/admin-guide/sysrq.rst
Original file line number Diff line number Diff line change
Expand Up @@ -48,32 +48,34 @@ 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::
.. note::
Some
keyboards may not have a key labeled 'SysRq'. The 'SysRq' key is
also known as the 'Print Screen' key. Also some keyboards cannot
handle so many keys being pressed at the same time, so you might
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
If you know of the key combos for other architectures, please
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

Expand Down Expand Up @@ -282,7 +284,7 @@ Just ask them on the linux-kernel mailing list:
Credits
~~~~~~~

Written by Mydraal <[email protected]>
Updated by Adam Sulmicki <[email protected]>
Updated by Jeremy M. Dolan <[email protected]> 2001/01/28 10:15:59
Added to by Crutcher Dunnavant <[email protected]>
- Written by Mydraal <[email protected]>
- Updated by Adam Sulmicki <[email protected]>
- Updated by Jeremy M. Dolan <[email protected]> 2001/01/28 10:15:59
- Added to by Crutcher Dunnavant <[email protected]>
7 changes: 2 additions & 5 deletions Documentation/driver-api/usb/writing_usb_driver.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 0 additions & 3 deletions Documentation/driver-api/w1.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
~~~~~~~~~~~~~~~~~~

Expand Down
2 changes: 1 addition & 1 deletion Documentation/filesystems/qnx6.rst
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ tree structures are treated as system blocks.

The rational behind that is that a write request can work on a new snapshot
(system area of the inactive - resp. lower serial numbered superblock) while
at the same time there is still a complete stable filesystem structer in the
at the same time there is still a complete stable filesystem structure in the
other half of the system area.

When finished with writing (a sync write is completed, the maximum sync leap
Expand Down

0 comments on commit ca6151a

Please sign in to comment.