From: David S. Miller <davem@davemloft.net>
Date: Thu, 23 Jul 2015 07:41:16 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=c5e40ee287db61a79af1746954ee03ebbf1ff8a3;p=linux-beck.git

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>
---

c5e40ee287db61a79af1746954ee03ebbf1ff8a3
diff --cc drivers/net/ethernet/renesas/ravb_main.c
index 47287c1cc7e0,78849dd4ef8e..779bb58a068e
--- a/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;