diff options
| author | David S. Miller <davem@davemloft.net> | 2018-10-21 20:54:28 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-10-21 20:54:28 +0200 |
| commit | 21ea1d36f6dfcb1d59184937c672022d5d01902a (patch) | |
| tree | f632c6e44500c5c0b1408594ac8b0ca4541c1332 /LICENSES | |
| parent | r8169: add support for Byte Queue Limits (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
| download | linux-21ea1d36f6dfcb1d59184937c672022d5d01902a.tar.xz linux-21ea1d36f6dfcb1d59184937c672022d5d01902a.zip | |
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>
Diffstat (limited to 'LICENSES')
0 files changed, 0 insertions, 0 deletions