David S. Miller 6f6e434aa2 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... S390 bpf_jit.S is removed in net-next and had changes in 'net', since that code isn't used any more take the removal. TLS data structures split the TX and RX components in 'net-next', put the new struct members from the bug fix in 'net' into the RX part. The 'net-next' tree had some reworking of how the ERSPAN code works in the GRE tunneling code, overlapping with a one-line headroom calculation fix in 'net'. Overlapping changes in __sock_map_ctx_update_elem(), keep the bits that read the prog members via READ_ONCE() into local variables before using them. Signed-off-by: David S. Miller <davem@davemloft.net>		2018-05-21 16:01:54 -04:00
..
api	tools lib api fs: Add sysfs__read_xll function	2018-02-16 10:09:23 -03:00
bpf	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2018-05-21 16:01:54 -04: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 symbol: Skip non-address kallsyms line	2018-02-16 14:25:56 -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