[Intel-gfx] [PATCH] drm/i915: Fix up broken merge

[Daniel Vetter]

On Mon, Jul 22, 2019 at 11:41 PM Chris Wilson <chris at chris-wilson.co.uk> wrote:
>
> Quoting Daniel Vetter (2019-07-22 22:37:59)
> > Maxime didn't really compile-test this :-/
> >
> > We need to re-apply
> >
> > commit e4fa8457b2197118538a1400b75c898f9faaf164
> > Author: Daniel Vetter <daniel.vetter at ffwll.ch>
> > Date:   Fri Jun 14 22:35:25 2019 +0200
> >
> >     drm/prime: Align gem_prime_export with obj_funcs.export
> >
> > plus make sure i915_gem_dma_buf.c doesn't get zombie-resurrect. It
> > moved in
> >
> > commit 10be98a77c558f8cfb823cd2777171fbb35040f6
> > Author: Chris Wilson <chris at chris-wilson.co.uk>
> > Date:   Tue May 28 10:29:49 2019 +0100
> >
> >     drm/i915: Move more GEM objects under gem/
> >
> > v2: Remember the selftests (Chris).
> >
> > Fixes: 03b0f2ce735e ("Merge v5.3-rc1 into drm-misc-next")
> > Cc: Maxime Ripard <maxime.ripard at bootlin.com>
> > Cc: Chris Wilson <chris at chris-wilson.co.uk>
> > Signed-off-by: Daniel Vetter <daniel.vetter at intel.com>
>
> Matches the same compile fix and git rm as I did locally,
> Reviewed-by: Chris Wilson <chris at chris-wilson.co.uk>

And pushed with Dave's irc-ack. Thanks for helping along to get this rectified.
-Daniel
-- 
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch