Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity into next

1 files changed, 4 insertions, 0 deletions

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 4fb49e0d2501..c73d27184c13 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -1330,6 +1330,10 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
                         Formats: { "ima" | "ima-ng" }
                         Default: "ima-ng"
 
+        ima_template_fmt=
+                        [IMA] Define a custom template format.
+                        Format: { "field1|...|fieldN" }
+
         ima.ahash_minsize= [IMA] Minimum file size for asynchronous hash usage
                         Format: <min_file_size>
                         Set the minimal file size for using asynchronous hash.