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
..
2018-02-23 14:09:43 -08:00
2018-01-30 22:26:14 -05:00
2018-01-31 11:23:28 -08:00
2018-01-22 20:03:57 -05:00
2017-12-15 12:51:42 -08:00
2018-03-20 16:59:01 -07:00
2018-02-01 10:00:28 -08:00
2018-03-27 14:11:46 -10:00
2018-03-14 17:02:49 -07:00
2017-12-18 13:55:43 -07:00
2018-03-07 10:50:15 -08:00
2018-02-23 14:09:43 -08:00
2017-12-04 20:32:53 -05:00
2017-12-04 20:32:53 -05:00
2017-08-25 17:21:11 -04:00
2017-08-24 22:29:06 -04:00
2018-03-14 23:31:13 -04:00
2018-03-27 14:11:46 -10:00
2017-08-25 17:21:10 -04:00
2017-08-08 11:49:51 -04:00
2017-11-14 16:23:44 -08:00
2018-01-31 11:23:28 -08:00
2017-12-07 21:32:03 -05:00
2018-03-07 10:50:15 -08:00
2017-11-14 16:23:44 -08:00
2017-04-13 13:58:20 -04:00
2018-01-31 11:23:28 -08:00
2017-11-14 16:23:44 -08:00
2017-09-07 12:12:43 -07:00
2018-03-14 17:02:49 -07:00
2018-03-27 14:11:46 -10:00
2018-01-08 22:27:32 -05:00
2018-02-11 14:34:03 -08:00
2017-12-04 20:32:53 -05:00
2017-04-26 18:32:29 -04:00
2018-03-07 10:50:15 -08:00