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

Browse source

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>

...

This commit is contained in:

David S. Miller 2017-04-21 20:23:53 -07:00

parent 1f4407e254 94836ecf1e

commit fb796707d7

59 changed files with 575 additions and 245 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

2

include/linux/mmc/sdio_func.h

View file

2

include/uapi/linux/ipv6_route.h

View file