Merge branch 'security-next-keys' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/security-keys into next-queue

As requested by David.
2026-11-02 19:05:42 +00:00 · 2012-10-03 13:00:17 +10:00 · 2012-10-03 13:00:17 +10:00 · 61d335dd27
commit 61d335dd27
parent 87b526d349 4442d7704c
21 changed files with 367 additions and 330 deletions
--- a/Documentation/security/keys.txt
+++ b/Documentation/security/keys.txt
--- a/fs/cifs/cifs_spnego.c
+++ b/fs/cifs/cifs_spnego.c
--- a/fs/cifs/cifsacl.c
+++ b/fs/cifs/cifsacl.c
--- a/fs/nfs/idmap.c
+++ b/fs/nfs/idmap.c
--- a/include/keys/user-type.h
+++ b/include/keys/user-type.h
--- a/include/linux/cred.h
+++ b/include/linux/cred.h
--- a/include/linux/key-type.h
+++ b/include/linux/key-type.h
--- a/include/linux/key.h
+++ b/include/linux/key.h
--- a/kernel/cred.c
+++ b/kernel/cred.c
--- a/net/ceph/crypto.c
+++ b/net/ceph/crypto.c
--- a/net/dns_resolver/dns_key.c
+++ b/net/dns_resolver/dns_key.c
--- a/net/rxrpc/ar-key.c
+++ b/net/rxrpc/ar-key.c
--- a/security/keys/encrypted-keys/encrypted.c
+++ b/security/keys/encrypted-keys/encrypted.c
--- a/security/keys/key.c
+++ b/security/keys/key.c
--- a/security/keys/keyctl.c
+++ b/security/keys/keyctl.c
--- a/security/keys/keyring.c
+++ b/security/keys/keyring.c
--- a/security/keys/process_keys.c
+++ b/security/keys/process_keys.c
--- a/security/keys/request_key.c
+++ b/security/keys/request_key.c
--- a/security/keys/request_key_auth.c
+++ b/security/keys/request_key_auth.c
--- a/security/keys/trusted.c
+++ b/security/keys/trusted.c
--- a/security/keys/user_defined.c
+++ b/security/keys/user_defined.c