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

The conflict was an interaction between a bug fix in the
netvsc driver in 'net' and an optimization of the RX path
in 'net-next'.

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

1 files changed, 0 insertions, 1 deletions

diff --git a/configure b/configure
index d9cebff..1ac21be 100755
--- a/configure
+++ b/configure
@@ -206,7 +206,6 @@ EOF
 	if [ ! -x $TMPDIR/tpacketv3test ] ; then
 		echo "[NO]"
 		MISSING_DEFS=1
-		tools_remove "netsniff-ng"
 	else
 		echo "[YES]"
 		HAVE_TPACKET3=1