From: David S. Miller <davem@davemloft.net>
Date: Thu, 30 Jun 2016 12:57:24 +0000 (-0400)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net... 
X-Git-Tag: v4.14-rc1~2930^2~27
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5ab0d6a016b19d8cbd503eafd0ef701cfd854402;p=platform%2Fkernel%2Flinux-rpi.git

Merge branch 'master' of git://git./linux/kernel/git/jkirsher/net-queue

Jeff Kirsher says:

====================
Intel Wired LAN Driver Updates 2016-06-29

This series contains fixes to e1000e and ixgbevf.

Jarod Wilson's fix for e1000e was a follow-on patch to his previous fix to
keep the hardware VLAN CTAG's for receive and transmit in sync, which
in turn resolves the original issue, so revert a portion of the original
fix.

Xin Long noticed that the ret_val needed to be initialized to IXGBE_ERR_MBX,
instead of -IXGBE_ERR_MBX.
====================

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

5ab0d6a016b19d8cbd503eafd0ef701cfd854402