![]() 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> |
||
---|---|---|
.. | ||
bond_3ad.c | ||
bond_alb.c | ||
bond_debugfs.c | ||
bond_main.c | ||
bond_netlink.c | ||
bond_options.c | ||
bond_procfs.c | ||
bond_sysfs.c | ||
bond_sysfs_slave.c | ||
bonding_priv.h | ||
Makefile |