tree b8c12edf3f510170cece6e9cf5337094af3095f2
parent 1f4407e2548827e3e6e7b943640a2da90c611306
parent 94836ecf1e7378b64d37624fbb81fe48fbd4c772
author David S. Miller <davem@davemloft.net> 1492831433 -0700
committer David S. Miller <davem@davemloft.net> 1492831433 -0700

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

Both conflict were simple overlapping changes.

In the kaweth case, Eric Dumazet's skb_cow() bug fix overlapped the
conversion of the driver in net-next to use in-netdev stats.

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