David S. Miller 6bb8824732 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... net/ipv6/ip6_gre.c is a case of parallel adds. include/trace/events/tcp.h is a little bit more tricky. The removal of in-trace-macro ifdefs in 'net' paralleled with moving show_tcp_state_name and friends over to include/trace/events/sock.h in 'net-next'. Signed-off-by: David S. Miller <davem@davemloft.net>		2017-12-29 15:42:26 -05:00
..
fault-injection	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
ktest	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
nvdimm	libnvdimm for 4.15	2017-11-17 09:51:57 -08:00
radix-tree	mm, truncate: do not check mapping for every page being truncated	2017-11-15 18:21:06 -08:00
scatterlist	tools/testing/scatterlist: Test new __sg_alloc_table_from_pages	2017-09-07 10:54:40 +01:00
selftests	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-12-29 15:42:26 -05:00
vsock	VSOCK: add tools/testing/vsock/vsock_diag_test	2017-10-05 18:44:17 -07:00