Re: [git pull] drm for v4.13

From: Dave Airlie
Date: Sun Jul 09 2017 - 23:01:50 EST


On 10 July 2017 at 10:43, Dave Airlie <airlied@xxxxxxxxx> wrote:
> Hi Linus,
>
> Sorry this is a bit late, I was on holidays start of last week and now
> I've got a post holiday illness.
> I had nearly all this ready pre holidays, just had one set of fixes
> and a cleanup on top, but I hadn't
> written the summary.
>
> This is the main pull request for the drm, I think I've got one later
> driver pull for mediatek SoC driver,
> I'm undecided on if it needs to go to you yet.

Forgot to add, because I just checked now, there are 2 conflicts,
the drm one with patches from Al, and one in i915_gem_execbuffer.c
which I think resolves best by just taking the code from the pull in place
of code in your tree.

Dave.