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

In netdevice.h we removed the structure in net-next that is being
changes in 'net'.  In macsec.c and rtnetlink.c we have overlaps
between fixes in 'net' and the u64 attribute changes in 'net-next'.

The mlx5 conflicts have to do with vxlan support dependencies.

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

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/ethernet/apm/xgene/xgene_enet_main.c
Simple merge

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

diff --cc drivers/net/ethernet/freescale/fec_main.c
Simple merge

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

diff --cc drivers/net/ethernet/mellanox/mlx5/core/Makefile
index b531d4f,bf65b71..e4a5b37
--- 1/drivers/net/ethernet/mellanox/mlx5/core/Makefile
--- 2/drivers/net/ethernet/mellanox/mlx5/core/Makefile
+++ b/drivers/net/ethernet/mellanox/mlx5/core/Makefile
@@@ -6,6 -6,7 +6,7 @@@ mlx5_core-y :=   main.o cmd.o debugfs.o f
  
  mlx5_core-$(CONFIG_MLX5_CORE_EN) += wq.o eswitch.o \
                en_main.o en_fs.o en_ethtool.o en_tx.o en_rx.o \
-               en_txrx.o en_clock.o vxlan.o en_tc.o en_arfs.o
 -              en_txrx.o en_clock.o en_tc.o
++              en_txrx.o en_clock.o en_tc.o en_arfs.o
  
+ mlx5_core-$(CONFIG_MLX5_CORE_EN_VXLAN) += vxlan.o
  mlx5_core-$(CONFIG_MLX5_CORE_EN_DCB) +=  en_dcbnl.o

diff --cc drivers/net/ethernet/mellanox/mlx5/core/en.h
index bfa5daa,24344aa..7aea32e
--- 1/drivers/net/ethernet/mellanox/mlx5/core/en.h
--- 2/drivers/net/ethernet/mellanox/mlx5/core/en.h
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en.h
@@@ -517,12 -558,15 +517,17 @@@ struct mlx5e_priv 
  
        struct mlx5e_channel     **channel;
        u32                        tisn[MLX5E_MAX_NUM_TC];
 -      u32                        rqtn[MLX5E_NUM_RQT];
 -      u32                        tirn[MLX5E_NUM_TT];
 +      u32                        indir_rqtn;
 +      u32                        indir_tirn[MLX5E_NUM_INDIR_TIRS];
 +      struct mlx5e_direct_tir    direct_tir[MLX5E_MAX_NUM_CHANNELS];
  
 +      struct mlx5e_flow_steering fs;
+       struct mlx5e_flow_tables   fts;
+       struct mlx5e_eth_addr_db   eth_addr;
+       struct mlx5e_vlan_db       vlan;
+ #ifdef CONFIG_MLX5_CORE_EN_VXLAN
        struct mlx5e_vxlan_db      vxlan;
+ #endif
  
        struct mlx5e_params        params;
        struct workqueue_struct    *wq;

diff --cc drivers/net/ethernet/mellanox/mlx5/core/en_main.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlxsw/spectrum.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c
Simple merge

diff --cc drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c
Simple merge

diff --cc drivers/net/ethernet/qlogic/qede/qede_main.c
Simple merge

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

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

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

diff --cc drivers/net/vxlan.c
index 2668e52,8ac261a..2f29d20
--- 1/drivers/net/vxlan.c
--- 2/drivers/net/vxlan.c
+++ b/drivers/net/vxlan.c
@@@ -611,10 -613,12 +611,11 @@@ out
        return pp;
  }
  
 -static int vxlan_gro_complete(struct sk_buff *skb, int nhoff,
 -                            struct udp_offload *uoff)
 +static int vxlan_gro_complete(struct sock *sk, struct sk_buff *skb, int nhoff)
  {
-       udp_tunnel_gro_complete(skb, nhoff);
- 
+       /* Sets 'skb->inner_mac_header' since we are always called with
+        * 'skb->encapsulation' set.
+        */
        return eth_gro_complete(skb, nhoff + sizeof(struct vxlanhdr));
  }
  

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

diff --cc include/uapi/linux/if_macsec.h
index 897a949,3411ed0..f7d4831
--- 1/include/uapi/linux/if_macsec.h
--- 2/include/uapi/linux/if_macsec.h
+++ b/include/uapi/linux/if_macsec.h
@@@ -79,9 -79,8 +81,9 @@@ enum macsec_sa_attrs 
        MACSEC_SA_ATTR_ACTIVE, /* config/dump, u8 0..1 */
        MACSEC_SA_ATTR_PN,     /* config/dump, u32 */
        MACSEC_SA_ATTR_KEY,    /* config, data */
-       MACSEC_SA_ATTR_KEYID,  /* config/dump, u64 */
+       MACSEC_SA_ATTR_KEYID,  /* config/dump, 128-bit */
        MACSEC_SA_ATTR_STATS,  /* dump, nested, macsec_sa_stats_attr */
 +      MACSEC_SA_ATTR_PAD,
        __MACSEC_SA_ATTR_END,
        NUM_MACSEC_SA_ATTR = __MACSEC_SA_ATTR_END,
        MACSEC_SA_ATTR_MAX = __MACSEC_SA_ATTR_END - 1,

diff --cc kernel/trace/trace_events.c
Simple merge

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

diff --cc net/core/rtnetlink.c
index d471f09,65763c2..d69c464
--- 1/net/core/rtnetlink.c
--- 2/net/core/rtnetlink.c
+++ b/net/core/rtnetlink.c
@@@ -1173,15 -1180,17 +1173,17 @@@ static noinline_for_stack int rtnl_fill
  
  static int rtnl_fill_link_ifmap(struct sk_buff *skb, struct net_device *dev)
  {
-       struct rtnl_link_ifmap map = {
-               .mem_start   = dev->mem_start,
-               .mem_end     = dev->mem_end,
-               .base_addr   = dev->base_addr,
-               .irq         = dev->irq,
-               .dma         = dev->dma,
-               .port        = dev->if_port,
-       };
+       struct rtnl_link_ifmap map;
+ 
+       memset(&map, 0, sizeof(map));
+       map.mem_start   = dev->mem_start;
+       map.mem_end     = dev->mem_end;
+       map.base_addr   = dev->base_addr;
+       map.irq         = dev->irq;
+       map.dma         = dev->dma;
+       map.port        = dev->if_port;
+ 
 -      if (nla_put(skb, IFLA_MAP, sizeof(map), &map))
 +      if (nla_put_64bit(skb, IFLA_MAP, sizeof(map), &map, IFLA_PAD))
                return -EMSGSIZE;
  
        return 0;

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

diff --cc net/ipv4/udp_offload.c
index 097060d,e330c0e..6b7459c
--- 1/net/ipv4/udp_offload.c
--- 2/net/ipv4/udp_offload.c
+++ b/net/ipv4/udp_offload.c
@@@ -350,22 -399,35 +350,24 @@@ int udp_gro_complete(struct sk_buff *sk
  
        uh->len = newlen;
  
+       /* Set encapsulation before calling into inner gro_complete() functions
+        * to make them set up the inner offsets.
+        */
+       skb->encapsulation = 1;
+ 
        rcu_read_lock();
 -
 -      uo_priv = rcu_dereference(udp_offload_base);
 -      for (; uo_priv != NULL; uo_priv = rcu_dereference(uo_priv->next)) {
 -              if (net_eq(read_pnet(&uo_priv->net), dev_net(skb->dev)) &&
 -                  uo_priv->offload->port == uh->dest &&
 -                  uo_priv->offload->callbacks.gro_complete)
 -                      break;
 -      }
 -
 -      if (uo_priv) {
 -              NAPI_GRO_CB(skb)->proto = uo_priv->offload->ipproto;
 -              err = uo_priv->offload->callbacks.gro_complete(skb,
 -                              nhoff + sizeof(struct udphdr),
 -                              uo_priv->offload);
 -      }
 -
 +      sk = (*lookup)(skb, uh->source, uh->dest);
 +      if (sk && udp_sk(sk)->gro_complete)
 +              err = udp_sk(sk)->gro_complete(sk, skb,
 +                              nhoff + sizeof(struct udphdr));
        rcu_read_unlock();
  
        if (skb->remcsum_offload)
                skb_shinfo(skb)->gso_type |= SKB_GSO_TUNNEL_REMCSUM;
  
-       skb->encapsulation = 1;
-       skb_set_inner_mac_header(skb, nhoff + sizeof(struct udphdr));
- 
        return err;
  }
 +EXPORT_SYMBOL(udp_gro_complete);
  
  static int udp4_gro_complete(struct sk_buff *skb, int nhoff)
  {

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

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