diff options
| author | James Morris <james.l.morris@oracle.com> | 2014-07-24 21:36:19 +1000 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2014-07-24 21:36:19 +1000 |
| commit | 4ca332e11df42604e784bd7da9e483160636d05e (patch) | |
| tree | 82e6ba6dff978edc2132e751c19197de50218c7e /Documentation/kernel-parameters.txt | |
| parent | 6d6f3328422a3bc56b0d8dd026a5de845d2abfa7 (diff) | |
| parent | 633706a2ee81637be37b6bc02c5336950cc163b5 (diff) | |
| download | net-4ca332e11df42604e784bd7da9e483160636d05e.tar.gz | |
Merge tag 'keys-next-20140722' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs into next
Diffstat (limited to 'Documentation/kernel-parameters.txt')
| -rw-r--r-- | Documentation/kernel-parameters.txt | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index 8b2ab548b6e42e..90c12c59116830 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt @@ -566,6 +566,11 @@ bytes respectively. Such letter suffixes can also be entirely omitted. possible to determine what the correct size should be. This option provides an override for these situations. + ca_keys= [KEYS] This parameter identifies a specific key(s) on + the system trusted keyring to be used for certificate + trust validation. + format: { id:<keyid> | builtin } + ccw_timeout_log [S390] See Documentation/s390/CommonIO for details. |