8fcc995495
Conflicts: security/integrity/evm/evm_crypto.c Resolved upstream fix vs. next conflict manually. Signed-off-by: James Morris <jmorris@namei.org> |
||
---|---|---|
.. | ||
encrypted-keys | ||
Makefile | ||
compat.c | ||
gc.c | ||
internal.h | ||
key.c | ||
keyctl.c | ||
keyring.c | ||
permission.c | ||
proc.c | ||
process_keys.c | ||
request_key.c | ||
request_key_auth.c | ||
sysctl.c | ||
trusted.c | ||
trusted.h | ||
user_defined.c |