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

Several cases of overlapping changes, except the packet scheduler
conflicts which deal with the addition of the free list parameter
to qdisc_enqueue().

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

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/boot/dts/dra7.dtsi
Simple merge

diff --cc drivers/net/can/dev.c
Simple merge

diff --cc drivers/net/can/usb/gs_usb.c
Simple merge

diff --cc drivers/net/ethernet/broadcom/bgmac.c
index e6e74ca86e606c03c5b56def74d6a8aa79d44a73,a6333d38ecc02be43614e02d69da3910127b0e9f..b045dc072c401ee9509a14fb180567a4069fca02
--- 1/drivers/net/ethernet/broadcom/bgmac.c
--- 2/drivers/net/ethernet/broadcom/bgmac.c
+++ b/drivers/net/ethernet/broadcom/bgmac.c
@@@ -1320,9 -1311,10 +1321,10 @@@ static int bgmac_open(struct net_devic
        }
        napi_enable(&bgmac->napi);
  
 -      phy_start(bgmac->phy_dev);
 +      phy_start(net_dev->phydev);
  
-       netif_carrier_on(net_dev);
+       netif_start_queue(net_dev);
+ 
        return 0;
  }
  

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

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

diff --cc drivers/net/ethernet/mellanox/mlx5/core/en.h
Simple merge

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

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

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

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

diff --cc drivers/net/ethernet/netronome/nfp/nfp_net_common.c
Simple merge

diff --cc drivers/net/ethernet/qlogic/qed/qed_l2.c
Simple merge

diff --cc drivers/net/ethernet/qlogic/qed/qed_main.c
Simple merge

diff --cc drivers/net/ethernet/qlogic/qed/qed_spq.c
Simple merge

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

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

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

diff --cc drivers/net/phy/fixed_phy.c
index b376ada83598a08eb12b9114268d7ecb37f95e72,9ec7f735343482eb4db054daa5fb5af4cec236ba..c649c101bbaba97ec44255b9ee1e7a878c26ada5
--- 1/drivers/net/phy/fixed_phy.c
--- 2/drivers/net/phy/fixed_phy.c
+++ b/drivers/net/phy/fixed_phy.c
@@@ -23,9 -23,9 +23,10 @@@
  #include <linux/slab.h>
  #include <linux/of.h>
  #include <linux/gpio.h>
 +#include <linux/seqlock.h>
+ #include <linux/idr.h>
  
 -#define MII_REGS_NUM 29
 +#include "swphy.h"
  
  struct fixed_mdio_bus {
        struct mii_bus *mii_bus;

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

diff --cc drivers/net/usb/r8152.c
index 11178f9dc838a95b6739aa740e08b32ccd259a4d,4e257b8d8f3e37e616e9ea5b5bf0de3d037bae90..24d367280ecfddd8d0cc2fea2240f8dfb12ca120
--- 1/drivers/net/usb/r8152.c
--- 2/drivers/net/usb/r8152.c
+++ b/drivers/net/usb/r8152.c
@@@ -2680,7 -2694,10 +2696,8 @@@ static void r8153_first_init(struct r81
        ocp_data &= ~RCR_ACPT_ALL;
        ocp_write_dword(tp, MCU_TYPE_PLA, PLA_RCR, ocp_data);
  
 -      r8153_hw_phy_cfg(tp);
 -
        rtl8152_nic_reset(tp);
+       rtl_reset_bmu(tp);
  
        ocp_data = ocp_read_byte(tp, MCU_TYPE_PLA, PLA_OOB_CTRL);
        ocp_data &= ~NOW_IS_OOB;

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

diff --cc drivers/net/wireless/ath/ath10k/core.c
Simple merge

diff --cc drivers/net/wireless/ath/ath10k/htt_rx.c
Simple merge

diff --cc drivers/net/wireless/ath/ath10k/mac.c
Simple merge

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

diff --cc include/linux/mlx4/device.h
Simple merge

diff --cc include/linux/qed/qed_eth_if.h
Simple merge

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

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

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

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

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

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

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

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

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

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

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

diff --cc net/rds/ib_cm.c
Simple merge

diff --cc net/rds/loop.c
Simple merge

diff --cc net/rds/tcp_connect.c
index ba9ec67f4e41fc13fc89d4225f5b97dc74b86476,f6e95d60db54b488e9e67375bf96b6cbda82d788..96c2c4d17909488aa0c8c2a23d6166536eba3d8b
--- 1/net/rds/tcp_connect.c
--- 2/net/rds/tcp_connect.c
+++ b/net/rds/tcp_connect.c
@@@ -55,20 -54,19 +55,20 @@@ void rds_tcp_state_change(struct sock *
  
        rdsdebug("sock %p state_change to %d\n", tc->t_sock, sk->sk_state);
  
-       switch(sk->sk_state) {
-               /* ignore connecting sockets as they make progress */
-               case TCP_SYN_SENT:
-               case TCP_SYN_RECV:
-                       break;
-               case TCP_ESTABLISHED:
-                       rds_connect_path_complete(&conn->c_path[0],
-                                                 RDS_CONN_CONNECTING);
-                       break;
-               case TCP_CLOSE_WAIT:
-               case TCP_CLOSE:
-                       rds_conn_drop(conn);
-               default:
-                       break;
+       switch (sk->sk_state) {
+       /* ignore connecting sockets as they make progress */
+       case TCP_SYN_SENT:
+       case TCP_SYN_RECV:
+               break;
+       case TCP_ESTABLISHED:
 -              rds_connect_path_complete(conn, RDS_CONN_CONNECTING);
++              rds_connect_path_complete(&conn->c_path[0],
++                                        RDS_CONN_CONNECTING);
+               break;
+       case TCP_CLOSE_WAIT:
+       case TCP_CLOSE:
+               rds_conn_drop(conn);
+       default:
+               break;
        }
  out:
        read_unlock_bh(&sk->sk_callback_lock);

diff --cc net/rds/tcp_listen.c
index 22d9bb15f7311a5741573b629c0e27c9dab2c048,245542ca4718dd69f6f3e87903136d8307e4f055..f9cc945a77b3c7bab156c5ce0cf71f441fe6cc68
--- 1/net/rds/tcp_listen.c
--- 2/net/rds/tcp_listen.c
+++ b/net/rds/tcp_listen.c
@@@ -137,10 -136,9 +137,10 @@@ int rds_tcp_accept_one(struct socket *s
                        goto rst_nsk;
                } else {
                        rds_tcp_reset_callbacks(new_sock, conn);
 -                      conn->c_outgoing = 0;
 +                      conn->c_path[0].cp_outgoing = 0;
                        /* rds_connect_path_complete() marks RDS_CONN_UP */
 -                      rds_connect_path_complete(conn, RDS_CONN_RESETTING);
 +                      rds_connect_path_complete(&conn->c_path[0],
-                                                 RDS_CONN_DISCONNECTING);
++                                                RDS_CONN_RESETTING);
                }
        } else {
                rds_tcp_set_callbacks(new_sock, conn);

diff --cc net/rds/tcp_recv.c
Simple merge

diff --cc net/rds/tcp_send.c
Simple merge

diff --cc net/sched/act_api.c
Simple merge

diff --cc net/sched/act_ife.c
Simple merge

diff --cc net/sched/act_ipt.c
Simple merge

diff --cc net/sched/sch_fifo.c
index 6ea0db427f91651ff5eba2acb5f7d69631a4133b,2e4bd2c0a50c497fbc6cbfe5338cab981559b491..baeed6a78d286b7b9ff230134c73085efa2ea1f5
--- 1/net/sched/sch_fifo.c
--- 2/net/sched/sch_fifo.c
+++ b/net/sched/sch_fifo.c
@@@ -34,17 -32,19 +34,20 @@@ static int pfifo_enqueue(struct sk_buf
        if (likely(skb_queue_len(&sch->q) < sch->limit))
                return qdisc_enqueue_tail(skb, sch);
  
 -      return qdisc_reshape_fail(skb, sch);
 +      return qdisc_drop(skb, sch, to_free);
  }
  
 -static int pfifo_tail_enqueue(struct sk_buff *skb, struct Qdisc *sch)
 +static int pfifo_tail_enqueue(struct sk_buff *skb, struct Qdisc *sch,
 +                            struct sk_buff **to_free)
  {
+       unsigned int prev_backlog;
+ 
        if (likely(skb_queue_len(&sch->q) < sch->limit))
                return qdisc_enqueue_tail(skb, sch);
  
+       prev_backlog = sch->qstats.backlog;
        /* queue full, remove one skb to fulfill the limit */
 -      __qdisc_queue_drop_head(sch, &sch->q);
 +      __qdisc_queue_drop_head(sch, &sch->q, to_free);
        qdisc_qstats_drop(sch);
        qdisc_enqueue_tail(skb, sch);
  

diff --cc net/sched/sch_htb.c
Simple merge

diff --cc net/sched/sch_netem.c
index 6eac3d8800480a4c463ae8d3b78a4fcfeec8165b,178f1630a036414629aed50256cf6a8c3a105984..aaaf0217533831e49878267d7767db7e18f110a3
--- 1/net/sched/sch_netem.c
--- 2/net/sched/sch_netem.c
+++ b/net/sched/sch_netem.c
@@@ -621,17 -650,14 +621,17 @@@ deliver
  #endif
  
                        if (q->qdisc) {
 -                              int err = qdisc_enqueue(skb, q->qdisc);
+                               unsigned int pkt_len = qdisc_pkt_len(skb);
 +                              struct sk_buff *to_free = NULL;
 +                              int err;
  
-                               if (unlikely(err != NET_XMIT_SUCCESS)) {
-                                       if (net_xmit_drop_count(err)) {
-                                               qdisc_qstats_drop(sch);
-                                               qdisc_tree_reduce_backlog(sch, 1,
-                                                                         qdisc_pkt_len(skb));
-                                       }
 +                              err = qdisc_enqueue(skb, q->qdisc, &to_free);
 +                              kfree_skb_list(to_free);
+                               if (err != NET_XMIT_SUCCESS &&
+                                   net_xmit_drop_count(err)) {
+                                       qdisc_qstats_drop(sch);
+                                       qdisc_tree_reduce_backlog(sch, 1,
+                                                                 pkt_len);
                                }
                                goto tfifo_dequeue;
                        }

diff --cc net/sched/sch_prio.c
Simple merge

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

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

diff --cc tools/virtio/ringtest/Makefile
index 50e086c6a7b6ae60d10fcc12c44697b0cda706f2,6173adae9f083670f8dca4b37f8c856ae46874d6..877a8a4721b679ea41c36464bc3bddcec44b9d53
--- 1/tools/virtio/ringtest/Makefile
--- 2/tools/virtio/ringtest/Makefile
+++ b/tools/virtio/ringtest/Makefile
@@@ -1,6 -1,6 +1,6 @@@
  all:
  
- all: ring virtio_ring_0_9 virtio_ring_poll virtio_ring_inorder ptr_ring
 -all: ring virtio_ring_0_9 virtio_ring_poll virtio_ring_inorder noring
++all: ring virtio_ring_0_9 virtio_ring_poll virtio_ring_inorder ptr_ring noring
  
  CFLAGS += -Wall
  CFLAGS += -pthread -O2 -ggdb
@@@ -16,13 -15,13 +16,15 @@@ ring: ring.o main.
  virtio_ring_0_9: virtio_ring_0_9.o main.o
  virtio_ring_poll: virtio_ring_poll.o main.o
  virtio_ring_inorder: virtio_ring_inorder.o main.o
 +ptr_ring: ptr_ring.o main.o
+ noring: noring.o main.o
  clean:
        -rm main.o
        -rm ring.o ring
        -rm virtio_ring_0_9.o virtio_ring_0_9
        -rm virtio_ring_poll.o virtio_ring_poll
        -rm virtio_ring_inorder.o virtio_ring_inorder
 +      -rm ptr_ring.o ptr_ring
+       -rm noring.o noring
  
  .PHONY: all clean