diff options
| author | David Howells <dhowells@redhat.com> | 2014-07-22 21:54:43 +0100 |
|---|---|---|
| committer | David Howells <dhowells@redhat.com> | 2014-07-22 21:54:43 +0100 |
| commit | 64724cfc6eea920dbaada14f0fb978b1dd31192d (patch) | |
| tree | d2f491be07a05e2d96b5c8b8e5a0a878f285eb22 /Documentation | |
| parent | 6204e0025566ad3992ce649d4f44b7e8cdde2293 (diff) | |
| parent | 7d2ce2320e8efdc4a6dcbae7b329ed3f0d1cd778 (diff) | |
| download | op-kernel-dev-64724cfc6eea920dbaada14f0fb978b1dd31192d.zip op-kernel-dev-64724cfc6eea920dbaada14f0fb978b1dd31192d.tar.gz | |
Merge remote-tracking branch 'integrity/next-with-keys' into keys-next
Signed-off-by: David Howells <dhowells@redhat.com>
Diffstat (limited to 'Documentation')
| -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 8b2ab54..90c12c5 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. |
