Commit 3fb6d0e0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents a3905af5 f37a15ea

Documentation/ABI/testing/ima_policy

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ Description: 
			option:	[[appraise_type=]] [template=] [permit_directio]

				[appraise_flag=] [keyrings=]

		  base:

			func:= [BPRM_CHECK][MMAP_CHECK][CREDS_CHECK][FILE_CHECK]MODULE_CHECK]

			func:= [BPRM_CHECK][MMAP_CHECK][CREDS_CHECK][FILE_CHECK][MODULE_CHECK]

			        [FIRMWARE_CHECK]

				[KEXEC_KERNEL_CHECK] [KEXEC_INITRAMFS_CHECK]

				[KEXEC_CMDLINE] [KEY_CHECK] [CRITICAL_DATA]

Documentation/admin-guide/cgroup-v2.rst

+1 −1
Original line number Diff line number Diff line
@@ -2098,7 +2098,7 @@ If the program returns 0, the attempt fails with -EPERM, otherwise 
it succeeds.



An example of BPF_CGROUP_DEVICE program may be found in the kernel

source tree in the tools/testing/selftests/bpf/dev_cgroup.c file.

source tree in the tools/testing/selftests/bpf/progs/dev_cgroup.c file.





RDMA

Documentation/conf.py

+1 −2
Original line number Diff line number Diff line
@@ -49,8 +49,7 @@ extensions = ['kerneldoc', 'rstFlatTable', 'kernel_include', 
if major >= 3:

    sys.stderr.write('''WARNING: The kernel documentation build process

        support for Sphinx v3.0 and above is brand new. Be prepared for

        possible issues in the generated output.

        ''')

        possible issues in the generated output.\n''')

    if (major > 3) or (minor > 0 or patch >= 2):

        # Sphinx c function parser is more pedantic with regards to type

        # checking. Due to that, having macros at c:function cause problems.

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

+0 −1
Original line number Diff line number Diff line
@@ -10,7 +10,6 @@ 
    |         arc: | TODO |

    |         arm: | TODO |

    |       arm64: | TODO |

    |         c6x: | TODO |

    |        csky: | TODO |

    |       h8300: | TODO |

    |     hexagon: | TODO |

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

+0 −1
Original line number Diff line number Diff line
@@ -10,7 +10,6 @@ 
    |         arc: | TODO |

    |         arm: |  ok  |

    |       arm64: |  ok  |

    |         c6x: | TODO |

    |        csky: | TODO |

    |       h8300: | TODO |

    |     hexagon: | TODO |