David S. Miller 89b1698c93 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>

2018-08-02 10:55:32 -07:00

..

api

docs: Fix some broken references

2018-06-15 18:10:01 -03:00

bpf

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

2018-08-02 10:55:32 -07:00

lockdep

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

subcmd

perf tools: Add '\n' at the end of parse-options error messages

2018-04-18 15:35:51 -03:00

symbol

tools lib symbols: Introduce kallsyms__is_function()

2018-04-26 13:47:14 -03:00

traceevent

tools lib traceevent: Fix get_field_str() for dynamic strings

2018-01-17 10:23:21 -03:00

bitmap.c

tools lib: Add bitmap_and function

2016-08-02 16:33:27 -03:00

find_bit.c

lib: optimize cpumask_next_and()

2018-02-06 18:32:44 -08:00

hweight.c

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

rbtree.c

tools: Copy lib/rbtree.c to tools/lib/

2015-07-05 22:48:21 -03:00

str_error_r.c

objtool, perf: Fix GCC 8 -Wrestrict error

2018-03-19 13:51:54 -03:00

string.c

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

vsprintf.c

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00