Skip to content

Commit ca6151a

Browse files
committed
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
2 parents 4e4bdcf + befacdc commit ca6151a

File tree

6 files changed

+22
-24
lines changed

6 files changed

+22
-24
lines changed

Documentation/admin-guide/binderfs.rst

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,12 @@ max
3333
a per-instance limit. If ``max=<count>`` is set then only ``<count>`` number
3434
of binder devices can be allocated in this binderfs instance.
3535

36+
stats
37+
Using ``stats=global`` enables global binder statistics.
38+
``stats=global`` is only available for a binderfs instance mounted in the
39+
initial user namespace. An attempt to use the option to mount a binderfs
40+
instance in another user namespace will return a permission error.
41+
3642
Allocating binder Devices
3743
-------------------------
3844

Documentation/admin-guide/kernel-parameters.txt

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -685,7 +685,7 @@
685685
coredump_filter=
686686
[KNL] Change the default value for
687687
/proc/<pid>/coredump_filter.
688-
See also Documentation/filesystems/proc.txt.
688+
See also Documentation/filesystems/proc.rst.
689689

690690
coresight_cpu_debug.enable
691691
[ARM,ARM64]
@@ -962,7 +962,7 @@
962962
edid/1680x1050.bin, or edid/1920x1080.bin is given
963963
and no file with the same name exists. Details and
964964
instructions how to build your own EDID data are
965-
available in Documentation/driver-api/edid.rst. An EDID
965+
available in Documentation/admin-guide/edid.rst. An EDID
966966
data set will only be used for a particular connector,
967967
if its name and a colon are prepended to the EDID
968968
name. Each connector may use a unique EDID data
@@ -992,10 +992,6 @@
992992
Documentation/admin-guide/dynamic-debug-howto.rst
993993
for details.
994994

995-
nompx [X86] Disables Intel Memory Protection Extensions.
996-
See Documentation/x86/intel_mpx.rst for more
997-
information about the feature.
998-
999995
nopku [X86] Disable Memory Protection Keys CPU feature found
1000996
in some Intel CPUs.
1001997

Documentation/admin-guide/sysrq.rst

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -48,32 +48,34 @@ always allowed (by a user with admin privileges).
4848
How do I use the magic SysRq key?
4949
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
5050

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

53-
.. note::
54+
.. note::
5455
Some
5556
keyboards may not have a key labeled 'SysRq'. The 'SysRq' key is
5657
also known as the 'Print Screen' key. Also some keyboards cannot
5758
handle so many keys being pressed at the same time, so you might
5859
have better luck with press :kbd:`Alt`, press :kbd:`SysRq`,
5960
release :kbd:`SysRq`, press :kbd:`<command key>`, release everything.
6061

61-
On SPARC - You press :kbd:`ALT-STOP-<command key>`, I believe.
62+
On SPARC
63+
You press :kbd:`ALT-STOP-<command key>`, I believe.
6264

6365
On the serial console (PC style standard serial ports only)
6466
You send a ``BREAK``, then within 5 seconds a command key. Sending
6567
``BREAK`` twice is interpreted as a normal BREAK.
6668

6769
On PowerPC
68-
Press :kbd:`ALT - Print Screen` (or :kbd:`F13`) - :kbd:`<command key>`,
70+
Press :kbd:`ALT - Print Screen` (or :kbd:`F13`) - :kbd:`<command key>`.
6971
:kbd:`Print Screen` (or :kbd:`F13`) - :kbd:`<command key>` may suffice.
7072

7173
On other
7274
If you know of the key combos for other architectures, please
7375
let me know so I can add them to this section.
7476

7577
On all
76-
write a character to /proc/sysrq-trigger. e.g.::
78+
Write a character to /proc/sysrq-trigger. e.g.::
7779

7880
echo t > /proc/sysrq-trigger
7981

@@ -282,7 +284,7 @@ Just ask them on the linux-kernel mailing list:
282284
Credits
283285
~~~~~~~
284286

285-
Written by Mydraal <[email protected]>
286-
Updated by Adam Sulmicki <[email protected]>
287-
Updated by Jeremy M. Dolan <[email protected]> 2001/01/28 10:15:59
288-
Added to by Crutcher Dunnavant <[email protected]>
287+
- Written by Mydraal <[email protected]>
288+
- Updated by Adam Sulmicki <[email protected]>
289+
- Updated by Jeremy M. Dolan <[email protected]> 2001/01/28 10:15:59
290+
- Added to by Crutcher Dunnavant <[email protected]>

Documentation/driver-api/usb/writing_usb_driver.rst

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -314,11 +314,8 @@ http://www.linux-usb.org/
314314
Linux Hotplug Project:
315315
http://linux-hotplug.sourceforge.net/
316316

317-
Linux USB Working Devices List:
318-
http://www.qbik.ch/usb/devices/
319-
320-
linux-usb-devel Mailing List Archives:
321-
http://marc.theaimsgroup.com/?l=linux-usb-devel
317+
linux-usb Mailing List Archives:
318+
https://lore.kernel.org/linux-usb/
322319

323320
Programming Guide for Linux USB Device Drivers:
324321
http://lmu.web.psi.ch/docu/manuals/software_manuals/linux_sl/usb_linux_programming_guide.pdf

Documentation/driver-api/w1.rst

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,6 @@ W1: Dallas' 1-wire bus
77
W1 API internal to the kernel
88
=============================
99

10-
W1 API internal to the kernel
11-
-----------------------------
12-
1310
include/linux/w1.h
1411
~~~~~~~~~~~~~~~~~~
1512

Documentation/filesystems/qnx6.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ tree structures are treated as system blocks.
185185

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

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

0 commit comments

Comments
 (0)