diff options
| author | Ingo Molnar <mingo@kernel.org> | 2024-12-20 10:25:44 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2024-12-20 10:25:44 +0100 |
| commit | 60675d4ca1ef0857e44eba5849b74a3a998d0c0f (patch) | |
| tree | b2fa39712aeca80db32be43f3f5be8e5a58bc0a3 /Documentation/filesystems/proc.rst | |
| parent | dd4059634dab548c904eeae2660ba3c8f7ce843c (diff) | |
| parent | 8faabc041a001140564f718dabe37753e88b37fa (diff) | |
Merge branch 'linus' into x86/mm, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'Documentation/filesystems/proc.rst')
| -rw-r--r-- | Documentation/filesystems/proc.rst | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/filesystems/proc.rst b/Documentation/filesystems/proc.rst index e834779d9611..6a882c57a7e7 100644 --- a/Documentation/filesystems/proc.rst +++ b/Documentation/filesystems/proc.rst @@ -579,7 +579,7 @@ encoded manner. The codes are the following: mt arm64 MTE allocation tags are enabled um userfaultfd missing tracking uw userfaultfd wr-protect tracking - ss shadow stack page + ss shadow/guarded control stack page sl sealed == ======================================= |