Merge tag 'docs-4.12' of git://git.lwn.net/linux
Pull documentation update from Jonathan Corbet: "A reasonably busy cycle for documentation this time around. There is a new guide for user-space API documents, rather sparsely populated at the moment, but it's a start. Markus improved the infrastructure for converting diagrams. Mauro has converted much of the USB documentation over to RST. Plus the usual set of fixes, improvements, and tweaks. There's a bit more than the usual amount of reaching out of Documentation/ to fix comments elsewhere in the tree; I have acks for those where I could get them" * tag 'docs-4.12' of git://git.lwn.net/linux: (74 commits) docs: Fix a couple typos docs: Fix a spelling error in vfio-mediated-device.txt docs: Fix a spelling error in ioctl-number.txt MAINTAINERS: update file entry for HSI subsystem Documentation: allow installing man pages to a user defined directory Doc/PM: Sync with intel_powerclamp code behavior zr364xx.rst: usb/devices is now at /sys/kernel/debug/ usb.rst: move documentation from proc_usb_info.txt to USB ReST book convert philips.txt to ReST and add to media docs docs-rst: usb: update old usbfs-related documentation arm: Documentation: update a path name docs: process/4.Coding.rst: Fix a couple of document refs docs-rst: fix usb cross-references usb: gadget.h: be consistent at kernel doc macros usb: composite.h: fix two warnings when building docs usb: get rid of some ReST doc build errors usb.rst: get rid of some Sphinx errors usb/URB.txt: convert to ReST and update it usb/persist.txt: convert to ReST and add to driver-api book usb/hotplug.txt: convert to ReST and add to driver-api book ...
This commit is contained in:
Linus Torvalds
@@ -130,7 +130,8 @@ config DYNAMIC_DEBUG
|
||||
nullarbor:~ # echo -n 'func svc_process -p' >
|
||||
<debugfs>/dynamic_debug/control
|
||||
|
||||
See Documentation/dynamic-debug-howto.txt for additional information.
|
||||
See Documentation/admin-guide/dynamic-debug-howto.rst for additional
|
||||
information.
|
||||
|
||||
endmenu # "printk and dmesg options"
|
||||
|
||||
@@ -404,8 +405,8 @@ config MAGIC_SYSRQ
|
||||
by pressing various keys while holding SysRq (Alt+PrintScreen). It
|
||||
also works on a serial console (on PC hardware at least), if you
|
||||
send a BREAK and then within 5 seconds a command keypress. The
|
||||
keys are documented in <file:Documentation/sysrq.txt>. Don't say Y
|
||||
unless you really know what this hack does.
|
||||
keys are documented in <file:Documentation/admin-guide/sysrq.rst>.
|
||||
Don't say Y unless you really know what this hack does.
|
||||
|
||||
config MAGIC_SYSRQ_DEFAULT_ENABLE
|
||||
hex "Enable magic SysRq key functions by default"
|
||||
@@ -414,7 +415,7 @@ config MAGIC_SYSRQ_DEFAULT_ENABLE
|
||||
help
|
||||
Specifies which SysRq key functions are enabled by default.
|
||||
This may be set to 1 or 0 to enable or disable them all, or
|
||||
to a bitmask as described in Documentation/sysrq.txt.
|
||||
to a bitmask as described in Documentation/admin-guide/sysrq.rst.
|
||||
|
||||
config MAGIC_SYSRQ_SERIAL
|
||||
bool "Enable magic SysRq key over serial"
|
||||
|
||||
28
lib/bitmap.c
28
lib/bitmap.c
@@ -502,11 +502,11 @@ EXPORT_SYMBOL(bitmap_print_to_pagebuf);
|
||||
* Syntax: range:used_size/group_size
|
||||
* Example: 0-1023:2/256 ==> 0,1,256,257,512,513,768,769
|
||||
*
|
||||
* Returns 0 on success, -errno on invalid input strings.
|
||||
* Error values:
|
||||
* %-EINVAL: second number in range smaller than first
|
||||
* %-EINVAL: invalid character in string
|
||||
* %-ERANGE: bit number specified too large for mask
|
||||
* Returns: 0 on success, -errno on invalid input strings. Error values:
|
||||
*
|
||||
* - ``-EINVAL``: second number in range smaller than first
|
||||
* - ``-EINVAL``: invalid character in string
|
||||
* - ``-ERANGE``: bit number specified too large for mask
|
||||
*/
|
||||
static int __bitmap_parselist(const char *buf, unsigned int buflen,
|
||||
int is_user, unsigned long *maskp,
|
||||
@@ -864,14 +864,16 @@ EXPORT_SYMBOL(bitmap_bitremap);
|
||||
* 11 was set in @orig had no affect on @dst.
|
||||
*
|
||||
* Example [2] for bitmap_fold() + bitmap_onto():
|
||||
* Let's say @relmap has these ten bits set:
|
||||
* Let's say @relmap has these ten bits set::
|
||||
*
|
||||
* 40 41 42 43 45 48 53 61 74 95
|
||||
*
|
||||
* (for the curious, that's 40 plus the first ten terms of the
|
||||
* Fibonacci sequence.)
|
||||
*
|
||||
* Further lets say we use the following code, invoking
|
||||
* bitmap_fold() then bitmap_onto, as suggested above to
|
||||
* avoid the possibility of an empty @dst result:
|
||||
* avoid the possibility of an empty @dst result::
|
||||
*
|
||||
* unsigned long *tmp; // a temporary bitmap's bits
|
||||
*
|
||||
@@ -882,22 +884,26 @@ EXPORT_SYMBOL(bitmap_bitremap);
|
||||
* various @orig's. I list the zero-based positions of each set bit.
|
||||
* The tmp column shows the intermediate result, as computed by
|
||||
* using bitmap_fold() to fold the @orig bitmap modulo ten
|
||||
* (the weight of @relmap).
|
||||
* (the weight of @relmap):
|
||||
*
|
||||
* =============== ============== =================
|
||||
* @orig tmp @dst
|
||||
* 0 0 40
|
||||
* 1 1 41
|
||||
* 9 9 95
|
||||
* 10 0 40 (*)
|
||||
* 10 0 40 [#f1]_
|
||||
* 1 3 5 7 1 3 5 7 41 43 48 61
|
||||
* 0 1 2 3 4 0 1 2 3 4 40 41 42 43 45
|
||||
* 0 9 18 27 0 9 8 7 40 61 74 95
|
||||
* 0 10 20 30 0 40
|
||||
* 0 11 22 33 0 1 2 3 40 41 42 43
|
||||
* 0 12 24 36 0 2 4 6 40 42 45 53
|
||||
* 78 102 211 1 2 8 41 42 74 (*)
|
||||
* 78 102 211 1 2 8 41 42 74 [#f1]_
|
||||
* =============== ============== =================
|
||||
*
|
||||
* (*) For these marked lines, if we hadn't first done bitmap_fold()
|
||||
* .. [#f1]
|
||||
*
|
||||
* For these marked lines, if we hadn't first done bitmap_fold()
|
||||
* into tmp, then the @dst result would have been empty.
|
||||
*
|
||||
* If either of @orig or @relmap is empty (no set bits), then @dst
|
||||
|
||||
@@ -131,7 +131,7 @@ EXPORT_SYMBOL(strncpy);
|
||||
* @src: Where to copy the string from
|
||||
* @size: size of destination buffer
|
||||
*
|
||||
* Compatible with *BSD: the result is always a valid
|
||||
* Compatible with ``*BSD``: the result is always a valid
|
||||
* NUL-terminated string that fits in the buffer (unless,
|
||||
* of course, the buffer size is zero). It does not pad
|
||||
* out the result like strncpy() does.
|
||||
|
||||
@@ -1954,13 +1954,13 @@ set_precision(struct printf_spec *spec, int prec)
|
||||
* This function generally follows C99 vsnprintf, but has some
|
||||
* extensions and a few limitations:
|
||||
*
|
||||
* %n is unsupported
|
||||
* %p* is handled by pointer()
|
||||
* - ``%n`` is unsupported
|
||||
* - ``%p*`` is handled by pointer()
|
||||
*
|
||||
* See pointer() or Documentation/printk-formats.txt for more
|
||||
* extensive description.
|
||||
*
|
||||
* ** Please update the documentation in both places when making changes **
|
||||
* **Please update the documentation in both places when making changes**
|
||||
*
|
||||
* The return value is the number of characters which would
|
||||
* be generated for the given input, excluding the trailing
|
||||
|
||||
Reference in New Issue
Block a user