Skip to content

Commit e68ce94

Browse files
committed
Merge tag 'docs-6.13-2' of git://git.lwn.net/linux
Pull more documentation updates from Jonathan Corbet: "A few late-arriving fixes, plus two more significant changes that were *almost* ready at the beginning of the merge window: - A new document on debugging techniques from Sebastian Fricke - A clarification on MODULE_LICENSE terms meant to head off the sort of confusion that led to the recent Tuxedo Computers mess" * tag 'docs-6.13-2' of git://git.lwn.net/linux: docs: Add debugging guide for the media subsystem docs: Add debugging section to process docs/licensing: Clarify wording about "GPL" and "Proprietary" docs: core-api/gfp_mask-from-fs-io: indicate that vmalloc supports GFP_NOFS/GFP_NOIO Documentation: kernel-doc: enumerate identifier *type*s Documentation: pwrseq: Fix trivial misspellings Documentation: filesystems: update filename extensions
2 parents 6daf088 + 83a474c commit e68ce94

17 files changed

+804
-31
lines changed

Documentation/admin-guide/media/index.rst

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,11 @@ Documentation/driver-api/media/index.rst
2020
- for driver development information and Kernel APIs used by
2121
media devices;
2222

23+
Documentation/process/debugging/media_specific_debugging_guide.rst
24+
25+
- for advice about essential tools and techniques to debug drivers on this
26+
subsystem
27+
2328
.. toctree::
2429
:caption: Table of Contents
2530
:maxdepth: 2

Documentation/core-api/gfp_mask-from-fs-io.rst

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -55,14 +55,16 @@ scope.
5555
What about __vmalloc(GFP_NOFS)
5656
==============================
5757

58-
vmalloc doesn't support GFP_NOFS semantic because there are hardcoded
59-
GFP_KERNEL allocations deep inside the allocator which are quite non-trivial
60-
to fix up. That means that calling ``vmalloc`` with GFP_NOFS/GFP_NOIO is
61-
almost always a bug. The good news is that the NOFS/NOIO semantic can be
62-
achieved by the scope API.
58+
Since v5.17, and specifically after the commit 451769ebb7e79 ("mm/vmalloc:
59+
alloc GFP_NO{FS,IO} for vmalloc"), GFP_NOFS/GFP_NOIO are now supported in
60+
``[k]vmalloc`` by implicitly using scope API.
61+
62+
In earlier kernels ``vmalloc`` didn't support GFP_NOFS semantic because there
63+
were hardcoded GFP_KERNEL allocations deep inside the allocator. That means
64+
that calling ``vmalloc`` with GFP_NOFS/GFP_NOIO was almost always a bug.
6365

6466
In the ideal world, upper layers should already mark dangerous contexts
65-
and so no special care is required and vmalloc should be called without
66-
any problems. Sometimes if the context is not really clear or there are
67-
layering violations then the recommended way around that is to wrap ``vmalloc``
68-
by the scope API with a comment explaining the problem.
67+
and so no special care is required and ``vmalloc`` should be called without any
68+
problems. Sometimes if the context is not really clear or there are layering
69+
violations then the recommended way around that (on pre-v5.17 kernels) is to
70+
wrap ``vmalloc`` by the scope API with a comment explaining the problem.

Documentation/doc-guide/kernel-doc.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -533,6 +533,7 @@ identifiers: *[ function/type ...]*
533533
Include documentation for each *function* and *type* in *source*.
534534
If no *function* is specified, the documentation for all functions
535535
and types in the *source* will be included.
536+
*type* can be a struct, union, enum, or typedef identifier.
536537

537538
Examples::
538539

Documentation/driver-api/pwrseq.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Introduction
1111
============
1212

1313
This framework is designed to abstract complex power-up sequences that are
14-
shared between multiple logical devices in the linux kernel.
14+
shared between multiple logical devices in the Linux kernel.
1515

1616
The intention is to allow consumers to obtain a power sequencing handle
1717
exposed by the power sequence provider and delegate the actual requesting and
@@ -25,7 +25,7 @@ The power sequencing API uses a number of terms specific to the subsystem:
2525

2626
Unit
2727

28-
A unit is a discreet chunk of a power sequence. For instance one unit may
28+
A unit is a discrete chunk of a power sequence. For instance one unit may
2929
enable a set of regulators, another may enable a specific GPIO. Units can
3030
define dependencies in the form of other units that must be enabled before
3131
it itself can be.
@@ -62,7 +62,7 @@ Provider interface
6262
The provider API is admittedly not nearly as straightforward as the one for
6363
consumers but it makes up for it in flexibility.
6464

65-
Each provider can logically split the power-up sequence into descrete chunks
65+
Each provider can logically split the power-up sequence into discrete chunks
6666
(units) and define their dependencies. They can then expose named targets that
6767
consumers may use as the final point in the sequence that they wish to reach.
6868

@@ -72,7 +72,7 @@ register with the pwrseq subsystem by calling pwrseq_device_register().
7272
Dynamic consumer matching
7373
-------------------------
7474

75-
The main difference between pwrseq and other linux kernel providers is the
75+
The main difference between pwrseq and other Linux kernel providers is the
7676
mechanism for dynamic matching of consumers and providers. Every power sequence
7777
provider driver must implement the `match()` callback and pass it to the pwrseq
7878
core when registering with the subsystems.

Documentation/filesystems/autofs.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -442,7 +442,7 @@ which can be used to communicate directly with the autofs filesystem.
442442
It requires CAP_SYS_ADMIN for access.
443443

444444
The 'ioctl's that can be used on this device are described in a separate
445-
document `autofs-mount-control.txt`, and are summarised briefly here.
445+
document `autofs-mount-control.rst`, and are summarised briefly here.
446446
Each ioctl is passed a pointer to an `autofs_dev_ioctl` structure::
447447

448448
struct autofs_dev_ioctl {

Documentation/filesystems/dlmfs.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ None
3636
Usage
3737
=====
3838

39-
If you're just interested in OCFS2, then please see ocfs2.txt. The
39+
If you're just interested in OCFS2, then please see ocfs2.rst. The
4040
rest of this document will be geared towards those who want to use
4141
dlmfs for easy to setup and easy to use clustered locking in
4242
userspace.

Documentation/filesystems/fsverity.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ btrfs filesystems. Like fscrypt, not too much filesystem-specific
1616
code is needed to support fs-verity.
1717

1818
fs-verity is similar to `dm-verity
19-
<https://www.kernel.org/doc/Documentation/device-mapper/verity.txt>`_
19+
<https://www.kernel.org/doc/Documentation/admin-guide/device-mapper/verity.rst>`_
2020
but works on files rather than block devices. On regular files on
2121
filesystems supporting fs-verity, userspace can execute an ioctl that
2222
causes the filesystem to build a Merkle tree for the file and persist

Documentation/filesystems/path-lookup.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -531,7 +531,7 @@ this retry process in the next article.
531531
Automount points are locations in the filesystem where an attempt to
532532
lookup a name can trigger changes to how that lookup should be
533533
handled, in particular by mounting a filesystem there. These are
534-
covered in greater detail in autofs.txt in the Linux documentation
534+
covered in greater detail in autofs.rst in the Linux documentation
535535
tree, but a few notes specifically related to path lookup are in order
536536
here.
537537

Documentation/filesystems/path-lookup.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -379,4 +379,4 @@ Papers and other documentation on dcache locking
379379

380380
2. http://lse.sourceforge.net/locking/dcache/dcache.html
381381

382-
3. path-lookup.md in this directory.
382+
3. path-lookup.rst in this directory.

Documentation/filesystems/ramfs-rootfs-initramfs.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -315,7 +315,7 @@ the above threads) is:
315315
2) The cpio archive format chosen by the kernel is simpler and cleaner (and
316316
thus easier to create and parse) than any of the (literally dozens of)
317317
various tar archive formats. The complete initramfs archive format is
318-
explained in buffer-format.txt, created in usr/gen_init_cpio.c, and
318+
explained in buffer-format.rst, created in usr/gen_init_cpio.c, and
319319
extracted in init/initramfs.c. All three together come to less than 26k
320320
total of human-readable text.
321321

0 commit comments

Comments
 (0)