linux-next: manual merge of the security tree with Linus' tree

[Stephen Rothwell]

Hi James,

Today's linux-next merge of the security tree got a conflict in
net/dns_resolver/dns_key.c between commit c6089735e724 ("userns: net:
Call key_alloc with GLOBAL_ROOT_UID, GLOBAL_ROOT_GID instead of 0, 0")
from Linus' tree and commit f8aa23a55f81 ("KEYS: Use keyring_alloc() to
create special keyrings") from the security tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    s...@canb.auug.org.au

diff --cc net/dns_resolver/dns_key.c
index 8aa4b11,b53bb4a..0000000
--- a/net/dns_resolver/dns_key.c
+++ b/net/dns_resolver/dns_key.c
@@@ -259,11 -259,10 +259,11 @@@ static int __init init_dns_resolver(voi
        if (!cred)
                return -ENOMEM;
  
-       keyring = key_alloc(&key_type_keyring, ".dns_resolver",
 -      keyring = keyring_alloc(".dns_resolver", 0, 0, cred,
 -                              (KEY_POS_ALL & ~KEY_POS_SETATTR) |
 -                              KEY_USR_VIEW | KEY_USR_READ,
 -                              KEY_ALLOC_NOT_IN_QUOTA, NULL);
++      keyring = keyring_alloc(".dns_resolver",
 +                          GLOBAL_ROOT_UID, GLOBAL_ROOT_GID, cred,
 +                          (KEY_POS_ALL & ~KEY_POS_SETATTR) |
 +                          KEY_USR_VIEW | KEY_USR_READ,
 +                          KEY_ALLOC_NOT_IN_QUOTA);
        if (IS_ERR(keyring)) {
                ret = PTR_ERR(keyring);
                goto failed_put_cred;

pgpW17iNxFoJe.pgp
Description: PGP signature