| commit | fb796707d7a6c9b24fdf80b9b4f24fa5ffcf0ec5 | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Fri Apr 21 20:23:53 2017 -0700 |
| committer | David S. Miller <davem@davemloft.net> | Fri Apr 21 20:23:53 2017 -0700 |
| tree | b8c12edf3f510170cece6e9cf5337094af3095f2 | |
| parent | 1f4407e2548827e3e6e7b943640a2da90c611306 [diff] | |
| parent | 94836ecf1e7378b64d37624fbb81fe48fbd4c772 [diff] |
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>