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

Conflicts:
	drivers/net/phy/bcm7xxx.c
	drivers/net/phy/marvell.c
	drivers/net/vxlan.c

All three conflicts were cases of simple overlapping changes.

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

1 files changed, 1 insertions, 1 deletions

diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c
index 3d835313575e..29b8d3a7b19b 100644
--- a/net/ipv4/devinet.c
+++ b/net/ipv4/devinet.c
@@ -1847,7 +1847,7 @@ static int inet_netconf_get_devconf(struct sk_buff *in_skb,
         if (err < 0)
                 goto errout;
 
-        err = EINVAL;
+        err = -EINVAL;
         if (!tb[NETCONFA_IFINDEX])
                 goto errout;