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

Just several instances of overlapping changes.

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

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/ethernet/agere/et131x.c
Simple merge

diff --cc drivers/net/ethernet/aurora/nb8800.c
Simple merge

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

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

diff --cc drivers/net/ethernet/ethoc.c
Simple merge

diff --cc drivers/net/ethernet/ezchip/nps_enet.c
Simple merge

diff --cc drivers/net/ethernet/intel/i40e/i40e_main.c
Simple merge

diff --cc drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx4/en_ethtool.c
index f32e272c83ddcebe1e7e633d5a8846d6c38d2ed1,44cf16d01f4275501870e3711fa27e5d8ec43a0e..bdda17d2ea0f9b9e6d8efd37f2637ef22b873cc3
--- 1/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c
--- 2/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c
+++ b/drivers/net/ethernet/mellanox/mlx4/en_ethtool.c
@@@ -1722,32 -1730,28 +1729,35 @@@ static int mlx4_en_set_channels(struct 
            !channel->tx_count || !channel->rx_count)
                return -EINVAL;
  
 +      if (channel->tx_count * MLX4_EN_NUM_UP <= priv->xdp_ring_num) {
 +              en_err(priv, "Minimum %d tx channels required with XDP on\n",
 +                     priv->xdp_ring_num / MLX4_EN_NUM_UP + 1);
 +              return -EINVAL;
 +      }
 +
+       tmp = kzalloc(sizeof(*tmp), GFP_KERNEL);
+       if (!tmp)
+               return -ENOMEM;
+ 
        mutex_lock(&mdev->state_lock);
+       memcpy(&new_prof, priv->prof, sizeof(struct mlx4_en_port_profile));
+       new_prof.num_tx_rings_p_up = channel->tx_count;
+       new_prof.tx_ring_num = channel->tx_count * MLX4_EN_NUM_UP;
+       new_prof.rx_ring_num = channel->rx_count;
+ 
+       err = mlx4_en_try_alloc_resources(priv, tmp, &new_prof);
+       if (err)
+               goto out;
+ 
        if (priv->port_up) {
                port_up = 1;
                mlx4_en_stop_port(dev, 1);
        }
  
-       mlx4_en_free_resources(priv);
- 
-       priv->num_tx_rings_p_up = channel->tx_count;
-       priv->tx_ring_num = channel->tx_count * MLX4_EN_NUM_UP;
-       priv->rx_ring_num = channel->rx_count;
- 
-       err = mlx4_en_alloc_resources(priv);
-       if (err) {
-               en_err(priv, "Failed reallocating port resources\n");
-               goto out;
-       }
+       mlx4_en_safe_replace_resources(priv, tmp);
  
 -      netif_set_real_num_tx_queues(dev, priv->tx_ring_num);
 +      netif_set_real_num_tx_queues(dev, priv->tx_ring_num -
 +                                                      priv->xdp_ring_num);
        netif_set_real_num_rx_queues(dev, priv->rx_ring_num);
  
        if (dev->num_tc)

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

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

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

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

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

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

diff --cc drivers/net/ppp/ppp_generic.c
Simple merge

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

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

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

diff --cc include/net/netfilter/nf_conntrack.h
Simple merge

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

diff --cc kernel/events/core.c
Simple merge

diff --cc net/8021q/vlan_dev.c
Simple merge

diff --cc net/batman-adv/bridge_loop_avoidance.c
Simple merge

diff --cc net/batman-adv/distributed-arp-table.c
Simple merge

diff --cc net/batman-adv/originator.c
Simple merge

diff --cc net/batman-adv/routing.c
Simple merge

diff --cc net/batman-adv/send.c
index 3a10d87b4b76594566b2378c1aa620e0018d71ba,010397650fa5b7c2c4e4912dc680440dbaf7e21d..6191159484df98f490bb70296cd53d55e76a1b74
--- 1/net/batman-adv/send.c
--- 2/net/batman-adv/send.c
+++ b/net/batman-adv/send.c
@@@ -435,11 -424,31 +435,11 @@@ int batadv_send_skb_via_gw(struct batad
        struct batadv_orig_node *orig_node;
  
        orig_node = batadv_gw_get_selected_orig(bat_priv);
-       return batadv_send_skb_unicast(bat_priv, skb, BATADV_UNICAST, 0,
-                                      orig_node, vid);
+       return batadv_send_skb_unicast(bat_priv, skb, BATADV_UNICAST_4ADDR,
+                                      BATADV_P_DATA, orig_node, vid);
  }
  
 -void batadv_schedule_bat_ogm(struct batadv_hard_iface *hard_iface)
 -{
 -      struct batadv_priv *bat_priv = netdev_priv(hard_iface->soft_iface);
 -
 -      if ((hard_iface->if_status == BATADV_IF_NOT_IN_USE) ||
 -          (hard_iface->if_status == BATADV_IF_TO_BE_REMOVED))
 -              return;
 -
 -      /* the interface gets activated here to avoid race conditions between
 -       * the moment of activating the interface in
 -       * hardif_activate_interface() where the originator mac is set and
 -       * outdated packets (especially uninitialized mac addresses) in the
 -       * packet queue
 -       */
 -      if (hard_iface->if_status == BATADV_IF_TO_BE_ACTIVATED)
 -              hard_iface->if_status = BATADV_IF_ACTIVE;
 -
 -      bat_priv->bat_algo_ops->bat_ogm_schedule(hard_iface);
 -}
 -
 -static void batadv_forw_packet_free(struct batadv_forw_packet *forw_packet)
 +void batadv_forw_packet_free(struct batadv_forw_packet *forw_packet)
  {
        kfree_skb(forw_packet->skb);
        if (forw_packet->if_incoming)

diff --cc net/batman-adv/types.h
Simple merge

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

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

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

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

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

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

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

diff --cc net/sched/sch_htb.c
index 91982d9784b31b7275eb444ea72983e971f9873c,052f84d6cc236176b64adbd2c2c3c7f38b18cb43..53dbfa187870a5dd0db69ab3108d7bc31d77caa2
--- 1/net/sched/sch_htb.c
--- 2/net/sched/sch_htb.c
+++ b/net/sched/sch_htb.c
@@@ -1113,22 -1136,18 +1113,24 @@@ static in
  htb_dump_class_stats(struct Qdisc *sch, unsigned long arg, struct gnet_dump *d)
  {
        struct htb_class *cl = (struct htb_class *)arg;
 +      struct gnet_stats_queue qs = {
 +              .drops = cl->drops,
 +      };
        __u32 qlen = 0;
  
 -      if (!cl->level && cl->un.leaf.q)
 +      if (!cl->level && cl->un.leaf.q) {
                qlen = cl->un.leaf.q->q.qlen;
-       cl->xstats.tokens = PSCHED_NS2TICKS(cl->tokens);
-       cl->xstats.ctokens = PSCHED_NS2TICKS(cl->ctokens);
 +              qs.backlog = cl->un.leaf.q->qstats.backlog;
 +      }
+       cl->xstats.tokens = clamp_t(s64, PSCHED_NS2TICKS(cl->tokens),
+                                   INT_MIN, INT_MAX);
+       cl->xstats.ctokens = clamp_t(s64, PSCHED_NS2TICKS(cl->ctokens),
+                                    INT_MIN, INT_MAX);
  
 -      if (gnet_stats_copy_basic(d, NULL, &cl->bstats) < 0 ||
 +      if (gnet_stats_copy_basic(qdisc_root_sleeping_running(sch),
 +                                d, NULL, &cl->bstats) < 0 ||
            gnet_stats_copy_rate_est(d, NULL, &cl->rate_est) < 0 ||
 -          gnet_stats_copy_queue(d, NULL, &cl->qstats, qlen) < 0)
 +          gnet_stats_copy_queue(d, NULL, &qs, qlen) < 0)
                return -1;
  
        return gnet_stats_copy_app(d, &cl->xstats, sizeof(cl->xstats));

diff --cc net/tipc/bearer.c
Simple merge

diff --cc net/tipc/bearer.h
Simple merge

diff --cc net/tipc/link.c
Simple merge

diff --cc net/tipc/node.c
Simple merge

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