]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: cc057ba fc983e6)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Sun, 21 Oct 2018 18:54:28 +0000 (11:54 -0700)
committerDavid S. Miller <davem@davemloft.net>
Sun, 21 Oct 2018 18:54:28 +0000 (11:54 -0700)
commit817668555c6446245fe2ec32ac1ca4fa2da2bd82
treef632c6e44500c5c0b1408594ac8b0ca4541c1332tree | snapshot
parentcc057baf3ad17a04728b19b4264a6a54567acb4acommit | diff
parentfc983e60fe568fda84609f66e125b254137d49dccommit | diff
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>
net/core/neighbour.c diff1 | diff2 | blob | history
net/core/skbuff.c diff1 | diff2 | blob | history
net/ipv6/addrconf.c diff1 | diff2 | blob | history
Linux Kernel Source Tree.