Merge remote-tracking branch 'userns/for-next'

diff --cc drivers/net/tun.c
Simple merge

diff --cc include/net/ipv6.h
Simple merge

diff --cc include/net/sock.h
Simple merge

diff --cc include/net/tcp.h
Simple merge

diff --cc init/Kconfig
Simple merge

diff --cc net/core/dev.c
Simple merge

diff --cc net/core/scm.c
Simple merge

diff --cc net/core/sock.c
Simple merge

diff --cc net/ipv4/tcp_ipv4.c
index 09356b3644d1f3a6c9648f942f6fa177be8ea466,642be8a4c6a33d2c88fa1de5f68c2579eb7b9920..d6132f800844eb83f3d161ef1983d7dbc453426f
--- 1/net/ipv4/tcp_ipv4.c
--- 2/net/ipv4/tcp_ipv4.c
+++ b/net/ipv4/tcp_ipv4.c
@@@ -2390,10 -2382,10 +2390,10 @@@ void tcp_proc_unregister(struct net *ne
  EXPORT_SYMBOL(tcp_proc_unregister);
  
  static void get_openreq4(const struct sock *sk, const struct request_sock *req,
-                        struct seq_file *f, int i, int uid, int *len)
+                        struct seq_file *f, int i, kuid_t uid, int *len)
  {
        const struct inet_request_sock *ireq = inet_rsk(req);
 -      int ttd = req->expires - jiffies;
 +      long delta = req->expires - jiffies;
  
        seq_printf(f, "%4d: %08X:%04X %08X:%04X"
                " %02X %08X:%08X %02X:%08lX %08X %5d %8d %u %d %pK%n",
@@@ -2405,9 -2397,9 +2405,9 @@@
                TCP_SYN_RECV,
                0, 0, /* could print option size, but that is af dependent. */
                1,    /* timers active (only the expire timer) */
 -              jiffies_to_clock_t(ttd),
 +              jiffies_delta_to_clock_t(delta),
                req->retrans,
-               uid,
+               from_kuid_munged(seq_user_ns(f), uid),
                0,  /* non standard timer */
                0, /* open_requests have no inode */
                atomic_read(&sk->sk_refcnt),
@@@ -2456,9 -2448,9 +2456,9 @@@ static void get_tcp4_sock(struct sock *
                tp->write_seq - tp->snd_una,
                rx_queue,
                timer_active,
 -              jiffies_to_clock_t(timer_expires - jiffies),
 +              jiffies_delta_to_clock_t(timer_expires - jiffies),
                icsk->icsk_retransmits,
-               sock_i_uid(sk),
+               from_kuid_munged(seq_user_ns(f), sock_i_uid(sk)),
                icsk->icsk_probes_out,
                sock_i_ino(sk),
                atomic_read(&sk->sk_refcnt), sk,

diff --cc net/ipv4/udp.c
Simple merge

diff --cc net/ipv6/tcp_ipv6.c
index 94987b8fc0fdecdaa0c41fd53ad08f0bcfe10590,4b5b335ebde132a09c7328e11e4e563fe8f44d11..4d63dffcdd1c0f443b1c9c9c333668909c29fdc2
--- 1/net/ipv6/tcp_ipv6.c
--- 2/net/ipv6/tcp_ipv6.c
+++ b/net/ipv6/tcp_ipv6.c
@@@ -1899,9 -1875,9 +1899,9 @@@ static void get_tcp6_sock(struct seq_fi
                   tp->write_seq-tp->snd_una,
                   (sp->sk_state == TCP_LISTEN) ? sp->sk_ack_backlog : (tp->rcv_nxt - tp->copied_seq),
                   timer_active,
 -                 jiffies_to_clock_t(timer_expires - jiffies),
 +                 jiffies_delta_to_clock_t(timer_expires - jiffies),
                   icsk->icsk_retransmits,
-                  sock_i_uid(sp),
+                  from_kuid_munged(seq_user_ns(seq), sock_i_uid(sp)),
                   icsk->icsk_probes_out,
                   sock_i_ino(sp),
                   atomic_read(&sp->sk_refcnt), sp,

diff --cc net/key/af_key.c
Simple merge

diff --cc net/packet/af_packet.c
Simple merge

diff --cc net/sctp/proc.c
Simple merge