projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: d92060b 23469de)
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)
commit21ea1d36f6dfcb1d59184937c672022d5d01902a
treef632c6e44500c5c0b1408594ac8b0ca4541c1332tree | snapshot
parentd92060bc69233a8175a0c2bfa0d2bce123cace2dcommit | diff
parent23469de647c4c7b68b5d135927b1c509f0e757e6commit | diff
Merge git://git./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
John Crispins staging tree