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	selftests/bpf: add architecture-agnostic headers	2018-05-10 00:40:58 +02:00
asm-generic	tools headers uapi: Update tools's copy of asm-generic/unistd.h	2018-09-11 11:04:43 -03:00
drm	tools headers uapi: Update tools's copy of drm/drm.h	2018-09-11 11:07:56 -03:00
linux	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2018-10-21 11:54:28 -07:00
sound	tools/headers: Synchronize kernel ABI headers, v4.17-rc1	2018-04-17 09:47:39 -03:00