On Fri, Jan 17, 2020 at 05:59:09PM +0100, Greg KH wrote:
> On Fri, Jan 17, 2020 at 04:12:27PM +0000, Steven Price wrote:
> > On Thu, Jan 16, 2020 at 04:39:37PM +0000, Sasha Levin wrote:
> > > From: Steven Price <steven.price@xxxxxxx>
> > >
> > > [ Upstream commit 52282163dfa651849e905886845bcf6850dd83c2 ]
> >
> > This commit is effectively already in 5.4. Confusingly there were two
> > versions of this upstream:
> >
> > 52282163dfa6 ("drm/panfrost: Add missing check for pfdev->regulator")
> > c90f30812a79 ("drm/panfrost: Add missing check for pfdev->regulator")
> >
> > It got merged both through a -fixes branch and through the normal merge
> > window. The two copies caused a bad merge in mainline and this was
> > effectively reverted in commit 603e398a3db2 ("drm/panfrost: Remove NULL
> > check for regulator").
> >
> > c90f30812a79 is included in v5.4 so should already be in any v5.4.y
> > release.
>
> Have I mentioned this month just how much I hate the way the DRM tree
> handles stable patches like this? This kind of fallout is a pain for
> stable maintainers, I dred every time I see a drm patch tagged for
> stable.
>
> But we've been over this all before :(
Another example is:
29cd13cfd762 ("drm/v3d: Fix memory leak in v3d_submit_cl_ioctl")
0d352a3a8a1f ("drm/v3d: don't leak bin job if v3d_job_init fails.")
Two fixes for a memory leak were merged so now it's a double free. I
sent a patch on Jan 10 but no one responded.
regards,
dan carpenter
