-
git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller authored
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 <davem@davemloft.net>
f83f7151git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller authoredMinor 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:
Loading