Hi James,
Today's linux-next merge of the security tree got a conflict in
Documentation/kernel-parameters.txt between commit fd1bb4c9fc2c ("MIPS:
Document the cca= command-line parameter") from the mips tree and
commit ffb70f61bab1 ("KEYS: validate certificate trust only with
selected key") from the security tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
diff --cc Documentation/kernel-parameters.txt
index 00d5a756152b,90c12c591168..000000000000
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@@ -566,12 -566,11 +566,17 @@@ bytes respectively. Such letter suffixe
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 }
+
+ cca= [MIPS] Override the kernel pages' cache coherency
+ algorithm. Accepted values range from 0 to 7
+ inclusive. See arch/mips/include/asm/pgtable-bits.h
+ for platform specific values (SB1, Loongson3 and
+ others).
+
ccw_timeout_log [S390]
See Documentation/s390/CommonIO for details.
Attachment:
signature.asc
Description: PGP signature
