summaryrefslogtreecommitdiffstats
path: root/Documentation/kernel-parameters.txt
diff options
context:
space:
mode:
authorJames Morris <james.l.morris@oracle.com>2014-10-02 19:47:23 +1000
committerJames Morris <james.l.morris@oracle.com>2014-10-02 19:47:23 +1000
commitc867d07e3c861e75509650b8a359351d634db93a (patch)
treef912043f48b9232db284ff67311eae8692918729 /Documentation/kernel-parameters.txt
parent858f61c4298d858376ca7b9fc2e05677faabd2d5 (diff)
parent1b68bdf9cded82d37e443a20c5ed47bbb084d5dc (diff)
downloadop-kernel-dev-c867d07e3c861e75509650b8a359351d634db93a.zip
op-kernel-dev-c867d07e3c861e75509650b8a359351d634db93a.tar.gz
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity into next
Diffstat (limited to 'Documentation/kernel-parameters.txt')
-rw-r--r--Documentation/kernel-parameters.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 0cd50491..802a3fd 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -1292,7 +1292,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
Set number of hash buckets for inode cache.
ima_appraise= [IMA] appraise integrity measurements
- Format: { "off" | "enforce" | "fix" }
+ Format: { "off" | "enforce" | "fix" | "log" }
default: "enforce"
ima_appraise_tcb [IMA]
OpenPOWER on IntegriCloud