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-15 14:50:32 -08:00
2018-03-02 10:44:44 +01:00
2018-02-02 10:01:04 -08:00
2018-03-31 23:37:33 -04:00
2018-03-29 09:57:09 +10:00
2018-03-05 07:57:41 -05:00
2018-03-09 09:33:48 -08:00
2018-03-21 11:10:20 +01:00
2018-02-01 10:31:17 -08:00
2018-03-08 10:39:58 -07:00
2018-01-02 14:46:35 +01:00
2018-03-12 15:11:59 +05:30
2018-03-14 13:01:14 -07:00
2017-12-18 16:47:27 +01:00
2018-02-05 10:07:40 -08:00
2018-02-06 09:59:40 -08:00
2017-12-19 10:56:53 +01:00
2018-01-22 16:45:26 +01:00
2018-03-25 07:04:00 -10:00
2018-01-09 16:15:20 +01:00
2018-03-09 16:54:18 -08:00
2018-02-01 10:31:17 -08:00
2018-02-06 09:59:40 -08:00