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> |
||
---|---|---|
.. | ||
af_llc.c | ||
Kconfig | ||
llc_c_ac.c | ||
llc_c_ev.c | ||
llc_c_st.c | ||
llc_conn.c | ||
llc_core.c | ||
llc_if.c | ||
llc_input.c | ||
llc_output.c | ||
llc_pdu.c | ||
llc_proc.c | ||
llc_s_ac.c | ||
llc_s_ev.c | ||
llc_s_st.c | ||
llc_sap.c | ||
llc_station.c | ||
Makefile | ||
sysctl_net_llc.c |