Re: [git pull] drm for v4.13

2017-07-09 Thread Linus Torvalds
On Sun, Jul 9, 2017 at 8:01 PM, Dave Airlie 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

Re: [git pull] drm for v4.13

2017-07-09 Thread Dave Airlie
On 10 July 2017 at 10:43, Dave Airlie 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 >