Files
kernel/include/linux
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-14 09:43:22 -08:00
2018-02-20 11:34:54 +00:00
2018-03-29 14:29:55 -04:00
2018-02-06 18:32:44 -08:00
2018-03-31 02:15:18 +02:00
2018-03-31 02:16:26 +02:00
2018-03-31 02:14:44 +02:00
2018-02-12 15:59:08 +00:00
2018-03-31 02:15:18 +02:00
2018-02-26 09:48:42 -07:00
2018-02-06 16:41:29 -05:00
2018-02-22 21:13:03 +01:00
2018-03-28 22:55:19 +02:00
2018-02-24 01:43:47 +01:00
2018-03-26 13:14:43 -04:00
2018-03-26 13:14:43 -04:00
2018-03-26 13:14:43 -04:00
2018-03-30 12:56:22 -04:00
2018-02-06 16:41:28 -05:00
2018-02-06 18:32:47 -08:00
2018-02-06 18:32:44 -08:00