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
..
2017-04-03 19:09:40 -07:00
2017-04-03 19:09:40 -07:00
2018-03-07 15:39:27 -05:00
2017-04-25 10:08:16 -04:00
2017-04-03 19:09:40 -07:00
2017-06-16 11:48:40 -04:00
2017-04-25 10:08:16 -04:00
2018-02-26 21:01:53 -05:00
2017-04-03 19:09:40 -07:00
2017-06-16 11:48:40 -04:00