David S. Miller 21ea1d36f6 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... David Ahern's dump indexing bug fix in 'net' overlapped the change of the function signature of inet6_fill_ifaddr() in 'net-next'. Trivially resolved. Signed-off-by: David S. Miller <davem@davemloft.net>		2018-10-21 11:54:28 -07:00
..
asm	tools/headers: Synchronize kernel ABI headers	2017-11-04 09:27:46 +01:00
asm-generic	mn10300: Remove the architecture	2018-03-09 23:19:56 +01:00
linux	tools/lib/lockdep: Add dummy task_struct state member	2018-09-10 13:48:24 +02:00
tools	tools: bpf: fix license for a compat header file	2018-09-19 23:49:58 +02:00
trace/events	tools/lib/lockdep: Remove private kernel headers	2017-06-05 09:28:14 +02:00
uapi	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2018-10-21 11:54:28 -07:00