On Wed, Jul 17, 2024 at 04:18:00PM +0300, Vladimir Oltean wrote:
> Hi Greg,
>
> On Tue, Jul 16, 2024 at 05:30:11PM +0200, Greg Kroah-Hartman wrote:
> > 6.9-stable review patch. If anyone has any objections, please let me know.
> >
> > ------------------
>
> This patch has a trivial conflict, in the context:
>
> > diff --git a/drivers/net/dsa/lan9303-core.c b/drivers/net/dsa/lan9303-core.c
> > index 666b4d766c005..1f7000f90bb78 100644
> > --- a/drivers/net/dsa/lan9303-core.c
> > +++ b/drivers/net/dsa/lan9303-core.c
> > chip->ds->priv = chip;
> > chip->ds->ops = &lan9303_switch_ops;
> > chip->ds->phylink_mac_ops = &lan9303_phylink_mac_ops;
> ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> here - this line is simply not present in stable kernels
>
> > - base = chip->phy_addr_base;
> > - chip->ds->phys_mii_mask = GENMASK(LAN9303_NUM_PORTS - 1 + base, base);
> > + chip->ds->phys_mii_mask = GENMASK(LAN9303_NUM_PORTS - 1, 0);
> >
> > return dsa_register_switch(chip->ds);
> > }
>
> But I don't advise backporting commits dd0c9855b413 ("net: dsa:
> introduce dsa_phylink_to_port()") and cae425cb43fe ("net: dsa: allow DSA
> switch drivers to provide their own phylink mac ops") in order to get
> that one line into this patch's context - because that line is just noise
> as far as this patch is concerned.
>
> I'm confused of what happened here.
>
> It looks like who generated these patches _knew_ that already, because
> when the patch was backported for 6.6, that conflict was properly
> resolved (notice how the chip->ds->phylink_mac_ops is not present in the
> context here: https://lore.kernel.org/stable/20240716152751.831607687@xxxxxxxxxxxxxxxxxxx/).
>
> But following that approach all the way to the end, "[PATCH 6.6 012/121]
> net: dsa: introduce dsa_phylink_to_port()" (https://lore.kernel.org/stable/20240716152751.792628497@xxxxxxxxxxxxxxxxxxx/)
> has no reason to exist! It is marked as a Stable-dep-of: the bug fix,
> but said bug fix was not backported in its original form anyway.
> Please drop it, it serves no purpose.
>
> I would advise dropping the following Stable-dep-of: patches for 6.9:
> https://lore.kernel.org/stable/20240716152756.461086951@xxxxxxxxxxxxxxxxxxx/
> https://lore.kernel.org/stable/20240716152756.498971328@xxxxxxxxxxxxxxxxxxx/
>
> and do the same for 6.9 as was done for 6.6: respin the patch without
> the "chip->ds->phylink_mac_ops" line in the context.
You're right, I've now dropped these "dep-of" patches for 6.9.y and the
one for 6.6.y as it wasn't needed their either.
thanks for the review!
greg k-h
