| commit | c0b458a9463bd6be165374a8e9e3235800ee132e | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Sun Apr 01 19:49:34 2018 -0400 |
| committer | David S. Miller <davem@davemloft.net> | Sun Apr 01 19:49:34 2018 -0400 |
| tree | a96c6393749ab231c6dda8c62683493bd1c66070 | |
| parent | 859a59352e926315b6384c5fd895b00a30659a12 [diff] | |
| parent | b5dbc28762fd3fd40ba76303be0c7f707826f982 [diff] |
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>