Re: [PATCH 4.19 46/58] net: dsa: mv88e6xxx: also read STU state in mv88e6250_g1_vtu_getnext

Greg Kroah-Hartman
2021-01-26T11:23:14Z

On Mon, Jan 25, 2021 at 08:59:54PM +0100, Rasmus Villemoes wrote:
> On 25/01/2021 20.40, Rasmus Villemoes wrote:
> > On 25/01/2021 19.39, Greg Kroah-Hartman wrote:
> >> From: Rasmus Villemoes <rasmus.villemoes@prevas.dk>
> >>
> >> commit 87fe04367d842c4d97a77303242d4dd4ac351e46 upstream.
> >>
> >
> > Greg, please drop this from 4.19-stable. Details:
> >
> >>
> >> --- a/drivers/net/dsa/mv88e6xxx/global1_vtu.c
> >> +++ b/drivers/net/dsa/mv88e6xxx/global1_vtu.c
> >> @@ -357,6 +357,10 @@ int mv88e6185_g1_vtu_getnext(struct mv88
> >> if (err)
> >> return err;
> >>
> >> + err = mv88e6185_g1_stu_data_read(chip, entry);
> >> + if (err)
> >> + return err;
> >> +
> >
> > The function that this patch applied to in mainline did not exist in
> > v4.19. It seems that this hunk has been applied in the similar
> > mv88e6185_g1_vtu_getnext(), and indeed, in current 4.19.y, just one more
> > line of context shows this:
>
> Bah, that was from 4.14, so the line numbers are a bit off, but I see
> you've also added it to the 4.14 queue. Same comment for that one: Drop
> this from both 4.19.y and 4.14.y.

Odd, but ok, the Fixes: line lied :)

I'll go drop this from both trees now, thanks.

greg k-h