projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'mfd-for-linus-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd
[deliverable/linux.git]
/
net
/
dns_resolver
/
dns_key.c
diff --git
a/net/dns_resolver/dns_key.c
b/net/dns_resolver/dns_key.c
index c79b85eb4d4ca4712465b6bbeda7ed74d2624344..8737412c7b27f33125c14c8aa6e64c4ce5cd2dc8 100644
(file)
--- a/
net/dns_resolver/dns_key.c
+++ b/
net/dns_resolver/dns_key.c
@@
-281,7
+281,7
@@
static int __init init_dns_resolver(void)
GLOBAL_ROOT_UID, GLOBAL_ROOT_GID, cred,
(KEY_POS_ALL & ~KEY_POS_SETATTR) |
KEY_USR_VIEW | KEY_USR_READ,
- KEY_ALLOC_NOT_IN_QUOTA, NULL);
+ KEY_ALLOC_NOT_IN_QUOTA, NULL
, NULL
);
if (IS_ERR(keyring)) {
ret = PTR_ERR(keyring);
goto failed_put_cred;
This page took
0.024896 seconds
and
5
git commands to generate.