diff options
| author | James Morris <james.l.morris@oracle.com> | 2014-10-02 19:47:23 +1000 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2014-10-02 19:47:23 +1000 |
| commit | c867d07e3c861e75509650b8a359351d634db93a (patch) | |
| tree | f912043f48b9232db284ff67311eae8692918729 /Documentation | |
| parent | 858f61c4298d858376ca7b9fc2e05677faabd2d5 (diff) | |
| parent | 1b68bdf9cded82d37e443a20c5ed47bbb084d5dc (diff) | |
| download | blackbird-op-linux-c867d07e3c861e75509650b8a359351d634db93a.tar.gz blackbird-op-linux-c867d07e3c861e75509650b8a359351d634db93a.zip | |
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity into next
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/kernel-parameters.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index 0cd50491c0a4..802a3fd9e485 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] |
