On Sun, Jul 9, 2017 at 8:01 PM, Dave Airlie <[email protected]> wrote: > > 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.
Heh. I pulled things over an hour ago, and yes, there were two
conflicts, both trivial.
Linus
