Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Conflicts:
	net/netfilter/nfnetlink_log.c
	net/netfilter/xt_LOG.c

Rather easy conflict resolution, the 'net' tree had bug fixes to make
sure we checked if a socket is a time-wait one or not and elide the
logging code if so.

Whereas on the 'net-next' side we are calculating the UID and GID from
the creds using different interfaces due to the user namespace changes
from Eric Biederman.

Signed-off-by: David S. Miller <davem@davemloft.net>

diff --cc Documentation/feature-removal-schedule.txt
Simple merge

diff --cc drivers/bluetooth/btusb.c
Simple merge

diff --cc drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h
Simple merge

diff --cc drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c
Simple merge

diff --cc drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
Simple merge

diff --cc drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
Simple merge

diff --cc drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c
Simple merge

diff --cc drivers/net/ethernet/ti/davinci_mdio.c
Simple merge

diff --cc drivers/net/usb/qmi_wwan.c
Simple merge

diff --cc drivers/net/usb/sierra_net.c
Simple merge

diff --cc drivers/net/wireless/ath/ath9k/xmit.c
Simple merge

diff --cc drivers/net/wireless/mwifiex/cmdevt.c
Simple merge

diff --cc drivers/net/wireless/rt2x00/rt2x00dev.c
Simple merge

diff --cc include/net/bluetooth/smp.h
Simple merge

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

diff --cc net/bluetooth/l2cap_core.c
Simple merge

diff --cc net/bluetooth/l2cap_sock.c
Simple merge

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

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

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

diff --cc net/ipv6/tcp_ipv6.c
Simple merge

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

diff --cc net/l2tp/l2tp_eth.c
Simple merge

diff --cc net/mac80211/cfg.c
Simple merge

diff --cc net/mac80211/mlme.c
Simple merge

diff --cc net/netfilter/nf_conntrack_proto_tcp.c
Simple merge

diff --cc net/netfilter/nfnetlink_log.c
index 8cb67c4dbd620661e34fa95a1192c67071a455ae,5cfb5bedb2b8e8f2fa44ed936a7cab265b5878e6..10067e3112c57fec8087dac753e56dacd2012a37
--- 1/net/netfilter/nfnetlink_log.c
--- 2/net/netfilter/nfnetlink_log.c
+++ b/net/netfilter/nfnetlink_log.c
@@@ -501,16 -500,14 +502,16 @@@ __build_packet_message(struct nfulnl_in
        }
  
        /* UID */
-       if (skb->sk) {
-               read_lock_bh(&skb->sk->sk_callback_lock);
-               if (skb->sk->sk_socket && skb->sk->sk_socket->file) {
-                       struct file *file = skb->sk->sk_socket->file;
+       sk = skb->sk;
+       if (sk && sk->sk_state != TCP_TIME_WAIT) {
+               read_lock_bh(&sk->sk_callback_lock);
+               if (sk->sk_socket && sk->sk_socket->file) {
+                       struct file *file = sk->sk_socket->file;
 -                      __be32 uid = htonl(file->f_cred->fsuid);
 -                      __be32 gid = htonl(file->f_cred->fsgid);
 +                      __be32 uid = htonl(from_kuid_munged(inst->peer_user_ns,
 +                                                          file->f_cred->fsuid));
 +                      __be32 gid = htonl(from_kgid_munged(inst->peer_user_ns,
 +                                                          file->f_cred->fsgid));
-                       /* need to unlock here since NLA_PUT may goto */
-                       read_unlock_bh(&skb->sk->sk_callback_lock);
+                       read_unlock_bh(&sk->sk_callback_lock);
                        if (nla_put_be32(inst->skb, NFULA_UID, uid) ||
                            nla_put_be32(inst->skb, NFULA_GID, gid))
                                goto nla_put_failure;

diff --cc net/netfilter/xt_LOG.c
index 02a2bf49dcbd13d307d4f0128fe092ca51e68eef,91e9af4d1f42c3baef9af1261c9464c70cd1bac0..aeb19710a6fd37883d85c5144d4897b94a8f0b6f
--- 1/net/netfilter/xt_LOG.c
--- 2/net/netfilter/xt_LOG.c
+++ b/net/netfilter/xt_LOG.c
@@@ -145,6 -145,19 +145,21 @@@ static int dump_tcp_header(struct sbuf
        return 0;
  }
  
 -      if (sk->sk_socket && sk->sk_socket->file)
+ static void dump_sk_uid_gid(struct sbuff *m, struct sock *sk)
+ {
+       if (!sk || sk->sk_state == TCP_TIME_WAIT)
+               return;
+ 
+       read_lock_bh(&sk->sk_callback_lock);
 -                      sk->sk_socket->file->f_cred->fsuid,
 -                      sk->sk_socket->file->f_cred->fsgid);
++      if (sk->sk_socket && sk->sk_socket->file) {
++              const struct cred *cred = sk->sk_socket->file->f_cred;
+               sb_add(m, "UID=%u GID=%u ",
++                     from_kuid_munged(&init_user_ns, cred->fsuid),
++                     from_kgid_munged(&init_user_ns, cred->fsgid));
++      }
+       read_unlock_bh(&sk->sk_callback_lock);
+ }
+ 
  /* One level of recursion won't kill us */
  static void dump_ipv4_packet(struct sbuff *m,
                        const struct nf_loginfo *info,

diff --cc net/openvswitch/actions.c
Simple merge

diff --cc net/openvswitch/datapath.c
Simple merge

diff --cc net/openvswitch/flow.h
Simple merge

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

diff --cc net/socket.c
Simple merge

diff --cc net/wireless/nl80211.c
Simple merge

diff --cc net/xfrm/xfrm_state.c
Simple merge