From: Daniel Vetter <daniel.vetter@ffwll.ch>
To: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Maxime Ripard <maxime.ripard@bootlin.com>,
Daniel Vetter <daniel.vetter@intel.com>,
Intel Graphics Development <intel-gfx@lists.freedesktop.org>,
DRI Development <dri-devel@lists.freedesktop.org>
Subject: Re: [PATCH] drm/i915: Fix up broken merge
Date: Mon, 22 Jul 2019 23:47:54 +0200 [thread overview]
Message-ID: <CAKMK7uH0XiqCaZwcsU5akTuw4ec5St=sLwkxSarNQCf=wgTJvw@mail.gmail.com> (raw)
In-Reply-To: <156383165396.31349.434812108404058391@skylake-alporthouse-com>
On Mon, Jul 22, 2019 at 11:41 PM Chris Wilson <chris@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@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@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@bootlin.com>
> > Cc: Chris Wilson <chris@chris-wilson.co.uk>
> > Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
>
> Matches the same compile fix and git rm as I did locally,
> Reviewed-by: Chris Wilson <chris@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
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
prev parent reply other threads:[~2019-07-22 21:48 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-22 21:21 [PATCH] drm/i915: Fix up broken merge Daniel Vetter
2019-07-22 21:30 ` Chris Wilson
2019-07-22 21:37 ` Daniel Vetter
2019-07-22 21:40 ` Chris Wilson
2019-07-22 21:47 ` Daniel Vetter [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAKMK7uH0XiqCaZwcsU5akTuw4ec5St=sLwkxSarNQCf=wgTJvw@mail.gmail.com' \
--to=daniel.vetter@ffwll.ch \
--cc=chris@chris-wilson.co.uk \
--cc=daniel.vetter@intel.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=maxime.ripard@bootlin.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.