Merge branch 'master'; commit 'v3.2-rc2' into next
This commit is contained in:
@@ -156,4 +156,5 @@ Load an encrypted key "evm" from saved blob:
|
||||
Other uses for trusted and encrypted keys, such as for disk and file encryption
|
||||
are anticipated. In particular the new format 'ecryptfs' has been defined in
|
||||
in order to use encrypted keys to mount an eCryptfs filesystem. More details
|
||||
about the usage can be found in the file 'Documentation/keys-ecryptfs.txt'.
|
||||
about the usage can be found in the file
|
||||
'Documentation/security/keys-ecryptfs.txt'.
|
||||
|
||||
Reference in New Issue
Block a user