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

2026-05-01 15:00:59 -07:00 · 2014-04-14 11:42:49 +10:00
parent ecd740c6f2 fffea214ab
commit b13cebe707
13 changed files with 59 additions and 52 deletions
@@ -879,7 +879,7 @@ static void cap_key_free(struct key *key)
 }

 static int cap_key_permission(key_ref_t key_ref, const struct cred *cred,
-			      key_perm_t perm)
+			      unsigned perm)
 {
 	return 0;
 }