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

Conflicts:
	include/net/inetpeer.h
	net/ipv6/output_core.c

Changes in net were fixing bugs in code removed in net-next.

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

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/ethernet/Kconfig
Simple merge

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

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

diff --cc drivers/net/ethernet/mellanox/mlx4/main.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx4/mlx4.h
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx4/port.c
index 376f2f1,5ec6f20..7ab9717
--- 1/drivers/net/ethernet/mellanox/mlx4/port.c
--- 2/drivers/net/ethernet/mellanox/mlx4/port.c
+++ b/drivers/net/ethernet/mellanox/mlx4/port.c
@@@ -705,8 -796,10 +795,9 @@@ static int mlx4_common_set_port(struct 
                                        if (!memcmp(gid_entry_mbox->raw, gid_entry_tbl->raw,
                                                    sizeof(gid_entry_tbl->raw))) {
                                                /* found duplicate */
 -                                              mlx4_warn(dev, "requested gid entry for slave:%d "
 -                                                        "is a duplicate of gid at index %d\n",
 +                                              mlx4_warn(dev, "requested gid entry for slave:%d is a duplicate of gid at index %d\n",
                                                          slave, i);
+                                               mutex_unlock(&(priv->port[port].gid_table.mutex));
                                                return -EINVAL;
                                        }
                                }

diff --cc drivers/net/ethernet/mellanox/mlx4/resource_tracker.c
Simple merge

diff --cc drivers/net/ethernet/renesas/sh_eth.c
Simple merge

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

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

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

diff --cc include/linux/netlink.h
Simple merge

diff --cc include/net/inetpeer.h
index 823ec7b,058271b..01d590e
--- 1/include/net/inetpeer.h
--- 2/include/net/inetpeer.h
+++ b/include/net/inetpeer.h
@@@ -171,5 -172,14 +171,4 @@@ static inline void inet_peer_refcheck(c
  {
        WARN_ON_ONCE(atomic_read(&p->refcnt) <= 0);
  }
 -
 -
 -/* can be called with or without local BH being disabled */
 -static inline int inet_getid(struct inet_peer *p, int more)
 -{
 -      more++;
 -      inet_peer_refcheck(p);
 -      return atomic_add_return(more, &p->ip_id_count) - more;
 -}
--
  #endif /* _NET_INETPEER_H */

diff --cc include/uapi/linux/audit.h
Simple merge

diff --cc net/bridge/br_fdb.c
Simple merge

diff --cc net/bridge/br_private.h
Simple merge

diff --cc net/bridge/br_vlan.c
Simple merge

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

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

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

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

diff --cc net/ipv6/output_core.c
index 6179ac1,56596ce..ffa0293
--- 1/net/ipv6/output_core.c
--- 2/net/ipv6/output_core.c
+++ b/net/ipv6/output_core.c
@@@ -8,7 -8,32 +8,6 @@@
  #include <net/addrconf.h>
  #include <net/secure_seq.h>
  
 -void ipv6_select_ident(struct frag_hdr *fhdr, struct rt6_info *rt)
 -{
 -      static atomic_t ipv6_fragmentation_id;
 -      struct in6_addr addr;
 -      int ident;
 -
 -#if IS_ENABLED(CONFIG_IPV6)
 -      struct inet_peer *peer;
 -      struct net *net;
 -
 -      net = dev_net(rt->dst.dev);
 -      peer = inet_getpeer_v6(net->ipv6.peers, &rt->rt6i_dst.addr, 1);
 -      if (peer) {
 -              fhdr->identification = htonl(inet_getid(peer, 0));
 -              inet_putpeer(peer);
 -              return;
 -      }
 -#endif
 -      ident = atomic_inc_return(&ipv6_fragmentation_id);
 -
 -      addr = rt->rt6i_dst.addr;
 -      addr.s6_addr32[0] ^= (__force __be32)ident;
 -      fhdr->identification = htonl(secure_ipv6_id(addr.s6_addr32));
 -}
 -EXPORT_SYMBOL(ipv6_select_ident);
--
  int ip6_find_1stfragopt(struct sk_buff *skb, u8 **nexthdr)
  {
        u16 offset = sizeof(struct ipv6hdr);

diff --cc net/netfilter/ipvs/ip_vs_core.c
Simple merge

diff --cc net/netlink/af_netlink.c
Simple merge

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