David S. Miller f83f715195 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 <davem@davemloft.net>

2019-04-05 14:14:19 -07:00

35 KiB

Raw Blame History

View Raw