From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 26 Feb 2021 22:21:18 +0000 (-0800)
Subject: Merge tag 'docs-5.12-2' of git://git.lwn.net/linux
X-Git-Tag: accepted/tizen/unified/20230118.172025~7712
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3fb6d0e00efc958d01c2f109c8453033a2d96796;p=platform%2Fkernel%2Flinux-rpi.git

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
---

3fb6d0e00efc958d01c2f109c8453033a2d96796
diff --cc Documentation/ABI/testing/ima_policy
index bc8e1cb,2617c21..070779e
--- a/Documentation/ABI/testing/ima_policy
+++ b/Documentation/ABI/testing/ima_policy
@@@ -29,10 -29,10 +29,10 @@@ 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]
 +				[KEXEC_CMDLINE] [KEY_CHECK] [CRITICAL_DATA]
  			mask:= [[^]MAY_READ] [[^]MAY_WRITE] [[^]MAY_APPEND]
  			       [[^]MAY_EXEC]
  			fsmagic:= hex value