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

Browse source

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>

...

This commit is contained in:

David S. Miller 2018-08-02 10:55:32 -07:00

parent ffd7ce3cd9 e30cb13c5a

commit 89b1698c93

239 changed files with 2004 additions and 915 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/uapi/linux/perf_event.h

View file