diff options
| author | David S. Miller <[email protected]> | 2019-04-05 21:14:19 +0000 |
|---|---|---|
| committer | David S. Miller <[email protected]> | 2019-04-05 21:14:19 +0000 |
| commit | f83f7151950dd9e0f6b4a1a405bf5e55c5294e4d (patch) | |
| tree | f8d9d8ee821fcc9f0a8e1a8679bc622219c70e3b /net/unix/af_unix.c | |
| parent | Merge branch 'tipc-improve-TIPC-unicast-link-throughput' (diff) | |
| parent | Merge tag 'mm-compaction-5.1-rc4' of git://git.kernel.org/pub/scm/linux/kerne... (diff) | |
| download | kernel-f83f7151950dd9e0f6b4a1a405bf5e55c5294e4d.tar.gz kernel-f83f7151950dd9e0f6b4a1a405bf5e55c5294e4d.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Minor comment merge conflict in mlx5.
Staging driver has a fixup due to the skb->xmit_more changes
in 'net-next', but was removed in 'net'.
Signed-off-by: David S. Miller <[email protected]>
Diffstat (limited to 'net/unix/af_unix.c')
0 files changed, 0 insertions, 0 deletions