Skip to content

Commit 01aa9d5

Browse files
torvaldstorvalds
committed
Merge tag 'docs-4.20' of git://git.lwn.net/linux
Pull documentation updates from Jonathan Corbet: "This is a fairly typical cycle for documentation. There's some welcome readability improvements for the formatted output, some LICENSES updates including the addition of the ISC license, the removal of the unloved and unmaintained 00-INDEX files, the deprecated APIs document from Kees, more MM docs from Mike Rapoport, and the usual pile of typo fixes and corrections" * tag 'docs-4.20' of git://git.lwn.net/linux: (41 commits) docs: Fix typos in histogram.rst docs: Introduce deprecated APIs list kernel-doc: fix declaration type determination doc: fix a typo in adding-syscalls.rst docs/admin-guide: memory-hotplug: remove table of contents doc: printk-formats: Remove bogus kobject references for device nodes Documentation: preempt-locking: Use better example dm flakey: Document "error_writes" feature docs/completion.txt: Fix a couple of punctuation nits LICENSES: Add ISC license text LICENSES: Add note to CDDL-1.0 license that it should not be used docs/core-api: memory-hotplug: add some details about locking internals docs/core-api: rename memory-hotplug-notifier to memory-hotplug docs: improve readability for people with poorer eyesight yama: clarify ptrace_scope=2 in Yama documentation docs/vm: split memory hotplug notifier description to Documentation/core-api docs: move memory hotplug description into admin-guide/mm doc: Fix acronym "FEKEK" in ecryptfs docs: fix some broken documentation references iommu: Fix passthrough option documentation ...
2 parents 5993692 + aea74de commit 01aa9d5

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

96 files changed

+679
-2100
lines changed

‎Documentation/00-INDEX

Lines changed: 0 additions & 428 deletions
This file was deleted.

‎Documentation/PCI/00-INDEX

Lines changed: 0 additions & 26 deletions
This file was deleted.

‎Documentation/RCU/00-INDEX

Lines changed: 0 additions & 34 deletions
This file was deleted.

‎Documentation/RCU/rcu.txt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,3 @@ o Where can I find more information on RCU?
8787

8888
See the RTFP.txt file in this directory.
8989
Or point your browser at http://www.rdrop.com/users/paulmck/RCU/.
90-
91-
o What are all these files in this directory?
92-
93-
See 00-INDEX for the list.

‎Documentation/admin-guide/LSM/Yama.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@ The sysctl settings (writable only with ``CAP_SYS_PTRACE``) are:
6464
Using ``PTRACE_TRACEME`` is unchanged.
6565

6666
2 - admin-only attach:
67-
only processes with ``CAP_SYS_PTRACE`` may use ptrace
68-
with ``PTRACE_ATTACH``, or through children calling ``PTRACE_TRACEME``.
67+
only processes with ``CAP_SYS_PTRACE`` may use ptrace, either with
68+
``PTRACE_ATTACH`` or through children calling ``PTRACE_TRACEME``.
6969

7070
3 - no attach:
7171
no processes may use ptrace with ``PTRACE_ATTACH`` nor via

‎Documentation/admin-guide/README.rst

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,7 @@ Documentation
5151

5252
- There are various README files in the Documentation/ subdirectory:
5353
these typically contain kernel-specific installation notes for some
54-
drivers for example. See Documentation/00-INDEX for a list of what
55-
is contained in each file. Please read the
54+
drivers for example. Please read the
5655
:ref:`Documentation/process/changes.rst <changes>` file, as it
5756
contains information about the problems, which may result by upgrading
5857
your kernel.

‎Documentation/admin-guide/kernel-parameters.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1764,7 +1764,7 @@
17641764
Format: { "0" | "1" }
17651765
0 - Use IOMMU translation for DMA.
17661766
1 - Bypass the IOMMU for DMA.
1767-
unset - Use IOMMU translation for DMA.
1767+
unset - Use value of CONFIG_IOMMU_DEFAULT_PASSTHROUGH.
17681768

17691769
io7= [HW] IO7 for Marvel based alpha systems
17701770
See comment before marvel_specify_io7 in

‎Documentation/admin-guide/l1tf.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -553,7 +553,7 @@ When nested virtualization is in use, three operating systems are involved:
553553
the bare metal hypervisor, the nested hypervisor and the nested virtual
554554
machine. VMENTER operations from the nested hypervisor into the nested
555555
guest will always be processed by the bare metal hypervisor. If KVM is the
556-
bare metal hypervisor it wiil:
556+
bare metal hypervisor it will:
557557

558558
- Flush the L1D cache on every switch from the nested hypervisor to the
559559
nested virtual machine, so that the nested hypervisor's secrets are not

‎Documentation/admin-guide/mm/index.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ the Linux memory management.
2929
hugetlbpage
3030
idle_page_tracking
3131
ksm
32+
memory-hotplug
3233
numa_memory_policy
3334
pagemap
3435
soft-dirty

0 commit comments

Comments
 (0)