mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 03:27:44 -04:00
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace
This is an initial merge in of Eric Biederman's work to start adding user namespace support to the networking. Signed-off-by: David S. Miller <[email protected]>
This commit is contained in:
commit
e6acb38480
52 changed files with 368 additions and 180 deletions
|
|
@ -3661,7 +3661,7 @@ static int pfkey_seq_show(struct seq_file *f, void *v)
|
|||
atomic_read(&s->sk_refcnt),
|
||||
sk_rmem_alloc_get(s),
|
||||
sk_wmem_alloc_get(s),
|
||||
sock_i_uid(s),
|
||||
from_kuid_munged(seq_user_ns(f), sock_i_uid(s)),
|
||||
sock_i_ino(s)
|
||||
);
|
||||
return 0;
|
||||
|
|
|
|||
Loading…
Reference in a new issue