Merge tag 'keys-20140314' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs into next

2014-04-14 11:42:49 +10:00
parent ecd740c6f2 fffea214ab
commit b13cebe707
13 changed files with 59 additions and 52 deletions
--- a/security/security.c
+++ b/security/security.c
@@ -1407,7 +1407,7 @@ void security_key_free(struct key *key)
 }

 int security_key_permission(key_ref_t key_ref,
-			    const struct cred *cred, key_perm_t perm)
+			    const struct cred *cred, unsigned perm)
 {
 	return security_ops->key_permission(key_ref, cred, perm);
 }