c0b458a946
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>
|
||
|---|---|---|
| .. | ||
| Documentation | ||
| bash-completion | ||
| Makefile | ||
| cfg.c | ||
| cfg.h | ||
| cgroup.c | ||
| common.c | ||
| jit_disasm.c | ||
| json_writer.c | ||
| json_writer.h | ||
| main.c | ||
| main.h | ||
| map.c | ||
| prog.c | ||
| xlated_dumper.c | ||
| xlated_dumper.h | ||