From: David S. Miller <davem@davemloft.net>
Date: Sat, 26 Sep 2015 23:08:27 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
X-Git-Tag: MMI-PSA29.97-13-9~9125^2~273
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=4963ed48f2c20196d51a447ee87dc2815584fee4;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Merge git://git./linux/kernel/git/davem/net

Conflicts:
	net/ipv4/arp.c

The net/ipv4/arp.c conflict was one commit adding a new
local variable while another commit was deleting one.

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

4963ed48f2c20196d51a447ee87dc2815584fee4
diff --cc net/ipv4/arp.c
index 61ff5ea31283,f03db8b7abee..01308e6e6127
--- a/net/ipv4/arp.c
+++ b/net/ipv4/arp.c
@@@ -654,6 -651,8 +657,7 @@@ static int arp_process(struct net *net
  	u16 dev_type = dev->type;
  	int addr_type;
  	struct neighbour *n;
 -	struct net *net = dev_net(dev);
+ 	struct dst_entry *reply_dst = NULL;
  	bool is_garp = false;
  
  	/* arp_rcv below verifies the ARP header and verifies the device