| commit | 21ea1d36f6dfcb1d59184937c672022d5d01902a | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Sun Oct 21 11:54:28 2018 -0700 |
| committer | David S. Miller <davem@davemloft.net> | Sun Oct 21 11:54:28 2018 -0700 |
| tree | f632c6e44500c5c0b1408594ac8b0ca4541c1332 | |
| parent | d92060bc69233a8175a0c2bfa0d2bce123cace2d [diff] | |
| parent | 23469de647c4c7b68b5d135927b1c509f0e757e6 [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>