Merge tag 'docs-5.9' of git://git.lwn.net/linux

[linux-2.6-microblaze.git] / Documentation / filesystems / f2fs.rst

diff --git a/Documentation/filesystems/f2fs.rst b/Documentation/filesystems/f2fs.rst
index 1e7dade..a11d329 100644 (file)
--- a/Documentation/filesystems/f2fs.rst
+++ b/Documentation/filesystems/f2fs.rst
@@ -258,6 +258,12 @@ compress_extension=%s       Support adding specified extension, so that f2fs can enab
                         on compression extension list and enable compression on
                         these file by default rather than to enable it via ioctl.
                         For other files, we can still enable compression via ioctl.
+inlinecrypt             When possible, encrypt/decrypt the contents of encrypted
+                        files using the blk-crypto framework rather than
+                        filesystem-layer encryption. This allows the use of
+                        inline encryption hardware. The on-disk format is
+                        unaffected. For more details, see
+                        Documentation/block/inline-encryption.rst.
 ======================== ============================================================
 
 Debugfs Entries