| commit | 89b1698c93a9dee043154f33d96bca9964e705f1 | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Thu Aug 02 10:55:32 2018 -0700 |
| committer | David S. Miller <davem@davemloft.net> | Thu Aug 02 10:55:32 2018 -0700 |
| tree | dd9dcb1965baae8edcf0b496aaa6a70609b6fc11 | |
| parent | ffd7ce3cd9c294f1ff49ec02cdbd1bc7cb913db6 [diff] | |
| parent | e30cb13c5a09ff5f043a6570c32e49b063bea6a1 [diff] |
Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net The BTF conflicts were simple overlapping changes. The virtio_net conflict was an overlap of a fix of statistics counter, happening alongisde a move over to a bonafide statistics structure rather than counting value on the stack. Signed-off-by: David S. Miller <davem@davemloft.net>