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

Conflicts:
	net/bridge/br_mdb.c

br_mdb.c conflict was a function call being removed to fix a bug in
'net' but whose signature was changed in 'net-next'.

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

diff --cc drivers/net/bonding/bond_main.c
Simple merge

diff --cc drivers/net/dsa/bcm_sf2.c
Simple merge

diff --cc drivers/net/dsa/mv88e6xxx.c
Simple merge

diff --cc drivers/net/ethernet/marvell/mvneta.c
Simple merge

diff --cc drivers/net/ethernet/renesas/ravb_main.c
index 47287c1,78849dd..779bb58
--- 1/drivers/net/ethernet/renesas/ravb_main.c
--- 2/drivers/net/ethernet/renesas/ravb_main.c
+++ b/drivers/net/ethernet/renesas/ravb_main.c
@@@ -223,14 -223,12 +223,12 @@@ static void ravb_ring_free(struct net_d
  static void ravb_ring_format(struct net_device *ndev, int q)
  {
        struct ravb_private *priv = netdev_priv(ndev);
 -      struct ravb_ex_rx_desc *rx_desc = NULL;
 -      struct ravb_tx_desc *tx_desc = NULL;
 -      struct ravb_desc *desc = NULL;
 +      struct ravb_ex_rx_desc *rx_desc;
 +      struct ravb_tx_desc *tx_desc;
 +      struct ravb_desc *desc;
        int rx_ring_size = sizeof(*rx_desc) * priv->num_rx_ring[q];
        int tx_ring_size = sizeof(*tx_desc) * priv->num_tx_ring[q];
-       struct sk_buff *skb;
        dma_addr_t dma_addr;
-       void *buffer;
        int i;
  
        priv->cur_rx[q] = 0;

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

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

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

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

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

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

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

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

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

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

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

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