Skip to content

Commit 3fb6d0e

Browse files
committed
Merge tag 'docs-5.12-2' of git://git.lwn.net/linux
Pull documentation fixes from Jonathan Corbet: "A handful of late-arriving documentation fixes, nothing all that notable" * tag 'docs-5.12-2' of git://git.lwn.net/linux: docs: proc.rst: fix indentation warning Documentation: cgroup-v2: fix path to example BPF program docs: powerpc: Fix tables in syscall64-abi.rst Documentation: features: refresh feature list Documentation: features: remove c6x references docs: ABI: testing: ima_policy: Fixed missing bracket Fix unaesthetic indentation scripts: kernel-doc: fix array element capture in pointer-to-func parsing doc: use KCFLAGS instead of EXTRA_CFLAGS to pass flags from command line Documentation: proc.rst: add more about the 6 fields in loadavg
2 parents a3905af + f37a15e commit 3fb6d0e

53 files changed

Lines changed: 56 additions & 81 deletions

File tree

Some content is hidden

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

Documentation/ABI/testing/ima_policy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ Description:
2929
option: [[appraise_type=]] [template=] [permit_directio]
3030
[appraise_flag=] [keyrings=]
3131
base:
32-
func:= [BPRM_CHECK][MMAP_CHECK][CREDS_CHECK][FILE_CHECK]MODULE_CHECK]
32+
func:= [BPRM_CHECK][MMAP_CHECK][CREDS_CHECK][FILE_CHECK][MODULE_CHECK]
3333
[FIRMWARE_CHECK]
3434
[KEXEC_KERNEL_CHECK] [KEXEC_INITRAMFS_CHECK]
3535
[KEXEC_CMDLINE] [KEY_CHECK] [CRITICAL_DATA]

Documentation/admin-guide/cgroup-v2.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2098,7 +2098,7 @@ If the program returns 0, the attempt fails with -EPERM, otherwise
20982098
it succeeds.
20992099

21002100
An example of BPF_CGROUP_DEVICE program may be found in the kernel
2101-
source tree in the tools/testing/selftests/bpf/dev_cgroup.c file.
2101+
source tree in the tools/testing/selftests/bpf/progs/dev_cgroup.c file.
21022102

21032103

21042104
RDMA

Documentation/conf.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,7 @@
4949
if major >= 3:
5050
sys.stderr.write('''WARNING: The kernel documentation build process
5151
support for Sphinx v3.0 and above is brand new. Be prepared for
52-
possible issues in the generated output.
53-
''')
52+
possible issues in the generated output.\n''')
5453
if (major > 3) or (minor > 0 or patch >= 2):
5554
# Sphinx c function parser is more pedantic with regards to type
5655
# checking. Due to that, having macros at c:function cause problems.

Documentation/features/core/cBPF-JIT/arch-support.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
| arc: | TODO |
1111
| arm: | TODO |
1212
| arm64: | TODO |
13-
| c6x: | TODO |
1413
| csky: | TODO |
1514
| h8300: | TODO |
1615
| hexagon: | TODO |

Documentation/features/core/eBPF-JIT/arch-support.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
| arc: | TODO |
1111
| arm: | ok |
1212
| arm64: | ok |
13-
| c6x: | TODO |
1413
| csky: | TODO |
1514
| h8300: | TODO |
1615
| hexagon: | TODO |

Documentation/features/core/generic-idle-thread/arch-support.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
| arc: | ok |
1111
| arm: | ok |
1212
| arm64: | ok |
13-
| c6x: | TODO |
1413
| csky: | ok |
1514
| h8300: | TODO |
1615
| hexagon: | ok |

Documentation/features/core/jump-labels/arch-support.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
| arc: | ok |
1111
| arm: | ok |
1212
| arm64: | ok |
13-
| c6x: | TODO |
1413
| csky: | TODO |
1514
| h8300: | TODO |
1615
| hexagon: | TODO |

Documentation/features/core/tracehook/arch-support.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
| arc: | ok |
1111
| arm: | ok |
1212
| arm64: | ok |
13-
| c6x: | ok |
1413
| csky: | ok |
1514
| h8300: | TODO |
1615
| hexagon: | ok |

Documentation/features/debug/KASAN/arch-support.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
| arc: | TODO |
1111
| arm: | ok |
1212
| arm64: | ok |
13-
| c6x: | TODO |
1413
| csky: | TODO |
1514
| h8300: | TODO |
1615
| hexagon: | TODO |

Documentation/features/debug/debug-vm-pgtable/arch-support.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
| arc: | ok |
1111
| arm: | TODO |
1212
| arm64: | ok |
13-
| c6x: | TODO |
1413
| csky: | TODO |
1514
| h8300: | TODO |
1615
| hexagon: | TODO |

0 commit comments

Comments
 (0)