Hi all,
On Thu, 24 Oct 2019 14:49:36 +0200 Daniel Vetter <daniel@xxxxxxxx> wrote:
>
> Ok adding Stephen. There's a merge conflict between drm-misc-fixes and
> drm-next (I think) and the merge double-added the kfree(bin). See
> above for the relevant sha1. Dave is already on here as a heads-up,
> but also adding drm-misc maintainers.
>
> > >> ---
> > >> drivers/gpu/drm/v3d/v3d_gem.c | 1 -
> > >> 1 file changed, 1 deletion(-)
> > >>
> > >> diff --git a/drivers/gpu/drm/v3d/v3d_gem.c b/drivers/gpu/drm/v3d/v3d_gem.c
> > >> index 549dde83408b..37515e47b47e 100644
> > >> --- a/drivers/gpu/drm/v3d/v3d_gem.c
> > >> +++ b/drivers/gpu/drm/v3d/v3d_gem.c
> > >> @@ -568,7 +568,6 @@ v3d_submit_cl_ioctl(struct drm_device *dev, void *data,
> > >> ret = v3d_job_init(v3d, file_priv, &bin->base,
> > >> v3d_job_free, args->in_sync_bcl);
> > >> if (ret) {
> > >> - kfree(bin);
> > >> v3d_job_put(&render->base);
> > >> kfree(bin);
> > >> return ret;
I will add this as a merge fixup until drm-misc-fixes is merged into
the drm tree.
--
Cheers,
Stephen Rothwell
Attachment:
pgpxbD1f164bB.pgp
Description: OpenPGP digital signature
_______________________________________________ dri-devel mailing list dri-devel@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/dri-devel
