Re: [PATCH net-next v3 01/15] net: dsa: microchip: enable EEE support

[Vladimir Oltean]

On Mon, Jan 30, 2023 at 09:07:00AM +0100, Oleksij Rempel wrote:
> @@ -3006,6 +3070,8 @@ static const struct dsa_switch_ops ksz_switch_ops = {
>  	.port_hwtstamp_set	= ksz_hwtstamp_set,
>  	.port_txtstamp		= ksz_port_txtstamp,
>  	.port_rxtstamp		= ksz_port_rxtstamp,
> +	.get_mac_eee		= ksz_get_mac_eee,
> +	.set_mac_eee		= ksz_set_mac_eee,
>  };

<<<<<<< head
	.port_setup_tc		= ksz_setup_tc,
=======
	.get_mac_eee		= ksz_get_mac_eee,
	.set_mac_eee		= ksz_set_mac_eee,
>>>>>>> net: dsa: microchip: enable eee support

with commit 71d7920fb2d1 ("net: dsa: microchip: add support for credit
based shaper").