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> |
||
---|---|---|
.. | ||
bpf.json | ||
connmark.json | ||
csum.json | ||
gact.json | ||
ife.json | ||
mirred.json | ||
nat.json | ||
pedit.json | ||
police.json | ||
sample.json | ||
simple.json | ||
skbedit.json | ||
skbmod.json | ||
tunnel_key.json | ||
vlan.json |