David S. Miller 3118e6e19d Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

The UDP offload conflict is dealt with by simply taking what is
in net-next where we have removed all of the UFO handling code
entirely.

The TCP conflict was a case of local variables in a function
being removed from both net and net-next.

In netvsc we had an assignment right next to where a missing
set of u64 stats sync object inits were added.

Signed-off-by: David S. Miller <davem@davemloft.net>

2017-08-09 16:28:45 -07:00

..

api

tools lib api fs: Add sysfs__write_int function

2017-06-21 11:35:27 -03:00

bpf

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

2017-08-09 16:28:45 -07:00

lockdep

tools/lib/lockdep: Remove private kernel headers

2017-06-05 09:28:14 +02:00

subcmd

tools lib string: Adopt prefixcmp() from perf and subcmd

2017-04-26 15:49:21 -03:00

symbol

perf tools: Move sane ctype stuff from util.h to sane_ctype.h

2017-04-19 13:01:48 -03:00

traceevent

scripts/spelling.txt: add "overide" pattern and fix typo instances

2017-03-09 17:01:09 -08:00

bitmap.c

tools lib: Add bitmap_and function

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

find_bit.c

lib/find_bit.c: micro-optimise find_next_*_bit

2017-02-24 17:46:57 -08:00

hweight.c

…

rbtree.c

…

str_error_r.c

tools: Introduce str_error_r()

2016-07-12 15:19:47 -03:00

string.c

tools lib string: Adopt prefixcmp() from perf and subcmd

2017-04-26 15:49:21 -03:00

vsprintf.c

perf tools: Uninline scnprintf() and vscnprint()

2016-07-12 15:20:24 -03:00