History

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

Linus Torvalds committed 6 years ago

Commit ca6151a2 parents 4e4bdcf befacdc6 files · +22 −24Browse files

Unified · Split

6 files
  1. Documentation/admin-guide/binderfs.rst +6 −0
  2. Documentation/admin-guide/kernel-parameters.txt +2 −6
  3. Documentation/admin-guide/sysrq.rst +11 −9
  4. Documentation/driver-api/usb/writing_usb_driver.rst +2 −5
  5. Documentation/driver-api/w1.rst +0 −3
  6. Documentation/filesystems/qnx6.rst +1 −1
Documentation/admin-guide/binderfs.rst+6−0
@@ -33,6 +33,12 @@ max · 32 unmodified lines
33 a per-instance limit. If ``max=<count>`` is set then only ``<count>`` number33 a per-instance limit. If ``max=<count>`` is set then only ``<count>`` number
34 of binder devices can be allocated in this binderfs instance.34 of binder devices can be allocated in this binderfs instance.
35 35
36stats
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
36Allocating binder Devices42Allocating binder Devices
37-------------------------43-------------------------
38 44
Documentation/admin-guide/kernel-parameters.txt+2−6
@@ -685,7 +685,7 @@ · 684 unmodified lines
685 coredump_filter=685 coredump_filter=
686 [KNL] Change the default value for686 [KNL] Change the default value for
687 /proc/<pid>/coredump_filter.687 /proc/<pid>/coredump_filter.
688 See also Documentation/filesystems/proc.txt.688 See also Documentation/filesystems/proc.rst.
689 689
690 coresight_cpu_debug.enable690 coresight_cpu_debug.enable
691 [ARM,ARM64]691 [ARM,ARM64]
@@ -962,7 +962,7 @@ · 270 unmodified lines
962 edid/1680x1050.bin, or edid/1920x1080.bin is given962 edid/1680x1050.bin, or edid/1920x1080.bin is given
963 and no file with the same name exists. Details and963 and no file with the same name exists. Details and
964 instructions how to build your own EDID data are964 instructions how to build your own EDID data are
965 available in Documentation/driver-api/edid.rst. An EDID965 available in Documentation/admin-guide/edid.rst. An EDID
966 data set will only be used for a particular connector,966 data set will only be used for a particular connector,
967 if its name and a colon are prepended to the EDID967 if its name and a colon are prepended to the EDID
968 name. Each connector may use a unique EDID data968 name. Each connector may use a unique EDID data
@@ -992,10 +992,6 @@ · 23 unmodified lines
992 Documentation/admin-guide/dynamic-debug-howto.rst992 Documentation/admin-guide/dynamic-debug-howto.rst
993 for details.993 for details.
994 994
995 nompx [X86] Disables Intel Memory Protection Extensions.
996 See Documentation/x86/intel_mpx.rst for more
997 information about the feature.
998
999 nopku [X86] Disable Memory Protection Keys CPU feature found995 nopku [X86] Disable Memory Protection Keys CPU feature found
1000 in some Intel CPUs.996 in some Intel CPUs.
1001 997
Documentation/admin-guide/sysrq.rst+11−9
@@ -48,9 +48,10 @@ always allowed (by a user with admin privileges). · 47 unmodified lines
48How do I use the magic SysRq key?48How do I use the magic SysRq key?
49~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~49~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
50 50
51On x86 - You press the key combo :kbd:`ALT-SysRq-<command key>`.51On x86
52 You press the key combo :kbd:`ALT-SysRq-<command key>`.
52 53
53.. note::54 .. note::
54 Some55 Some
55 keyboards may not have a key labeled 'SysRq'. The 'SysRq' key is56 keyboards may not have a key labeled 'SysRq'. The 'SysRq' key is
56 also known as the 'Print Screen' key. Also some keyboards cannot57 also known as the 'Print Screen' key. Also some keyboards cannot
@@ -58,14 +59,15 @@ On x86 - You press the key combo :kbd:`ALT-SysRq-<command key>`. · 1 unmodified line
58 have better luck with press :kbd:`Alt`, press :kbd:`SysRq`,59 have better luck with press :kbd:`Alt`, press :kbd:`SysRq`,
59 release :kbd:`SysRq`, press :kbd:`<command key>`, release everything.60 release :kbd:`SysRq`, press :kbd:`<command key>`, release everything.
60 61
61On SPARC - You press :kbd:`ALT-STOP-<command key>`, I believe.62On SPARC
63 You press :kbd:`ALT-STOP-<command key>`, I believe.
62 64
63On the serial console (PC style standard serial ports only)65On the serial console (PC style standard serial ports only)
64 You send a ``BREAK``, then within 5 seconds a command key. Sending66 You send a ``BREAK``, then within 5 seconds a command key. Sending
65 ``BREAK`` twice is interpreted as a normal BREAK.67 ``BREAK`` twice is interpreted as a normal BREAK.
66 68
67On PowerPC69On 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>`.
69 :kbd:`Print Screen` (or :kbd:`F13`) - :kbd:`<command key>` may suffice.71 :kbd:`Print Screen` (or :kbd:`F13`) - :kbd:`<command key>` may suffice.
70 72
71On other73On other
@@ -73,7 +75,7 @@ On other · 1 unmodified line
73 let me know so I can add them to this section.75 let me know so I can add them to this section.
74 76
75On all77On all
76 write a character to /proc/sysrq-trigger. e.g.::78 Write a character to /proc/sysrq-trigger. e.g.::
77 79
78 echo t > /proc/sysrq-trigger80 echo t > /proc/sysrq-trigger
79 81
@@ -282,7 +284,7 @@ Just ask them on the linux-kernel mailing list: · 202 unmodified lines
282Credits284Credits
283~~~~~~~285~~~~~~~
284 286
285Written by Mydraal <vulpyne@vulpyne.net>287- Written by Mydraal <vulpyne@vulpyne.net>
286Updated by Adam Sulmicki <adam@cfar.umd.edu>288- Updated by Adam Sulmicki <adam@cfar.umd.edu>
287Updated by Jeremy M. Dolan <jmd@turbogeek.org> 2001/01/28 10:15:59289- Updated by Jeremy M. Dolan <jmd@turbogeek.org> 2001/01/28 10:15:59
288Added to by Crutcher Dunnavant <crutcher+kernel@datastacks.com>290- Added to by Crutcher Dunnavant <crutcher+kernel@datastacks.com>
Documentation/driver-api/usb/writing_usb_driver.rst+2−5
@@ -314,11 +314,8 @@ http://www.linux-usb.org/ · 313 unmodified lines
314Linux Hotplug Project:314Linux Hotplug Project:
315http://linux-hotplug.sourceforge.net/315http://linux-hotplug.sourceforge.net/
316 316
317Linux USB Working Devices List:317linux-usb Mailing List Archives:
318http://www.qbik.ch/usb/devices/318https://lore.kernel.org/linux-usb/
319
320linux-usb-devel Mailing List Archives:
321http://marc.theaimsgroup.com/?l=linux-usb-devel
322 319
323Programming Guide for Linux USB Device Drivers:320Programming Guide for Linux USB Device Drivers:
324http://lmu.web.psi.ch/docu/manuals/software_manuals/linux_sl/usb_linux_programming_guide.pdf321http://lmu.web.psi.ch/docu/manuals/software_manuals/linux_sl/usb_linux_programming_guide.pdf
Documentation/driver-api/w1.rst+0−3
@@ -7,9 +7,6 @@ W1: Dallas' 1-wire bus · 6 unmodified lines
7W1 API internal to the kernel7W1 API internal to the kernel
8=============================8=============================
9 9
10W1 API internal to the kernel
11-----------------------------
12
13include/linux/w1.h10include/linux/w1.h
14~~~~~~~~~~~~~~~~~~11~~~~~~~~~~~~~~~~~~
15 12
Documentation/filesystems/qnx6.rst+1−1
@@ -185,7 +185,7 @@ tree structures are treated as system blocks. · 184 unmodified lines
185 185
186The rational behind that is that a write request can work on a new snapshot186The rational behind that is that a write request can work on a new snapshot
187(system area of the inactive - resp. lower serial numbered superblock) while187(system area of the inactive - resp. lower serial numbered superblock) while
188at the same time there is still a complete stable filesystem structer in the188at the same time there is still a complete stable filesystem structure in the
189other half of the system area.189other half of the system area.
190 190
191When finished with writing (a sync write is completed, the maximum sync leap191When finished with writing (a sync write is completed, the maximum sync leap

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t