David S. Miller c0b458a946 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Minor conflicts in drivers/net/ethernet/mellanox/mlx5/core/en_rep.c,
we had some overlapping changes:

1) In 'net' MLX5E_PARAMS_LOG_{SQ,RQ}_SIZE -->
   MLX5E_REP_PARAMS_LOG_{SQ,RQ}_SIZE

2) In 'net-next' params->log_rq_size is renamed to be
   params->log_rq_mtu_frames.

3) In 'net-next' params->hard_mtu is added.

Signed-off-by: David S. Miller <davem@davemloft.net>
2018-04-01 19:49:34 -04:00
..
2015-06-12 14:49:18 -04:00
2015-05-05 13:21:27 -04:00
2018-03-27 13:18:09 -04:00
2016-01-19 15:25:45 -05:00
2016-05-13 13:37:18 -04:00
2016-03-03 10:20:25 -05:00
2017-08-31 08:35:09 -04:00
2018-02-11 14:34:03 -08:00
2016-03-03 10:20:25 -05:00
2017-12-18 15:37:06 -07:00