Re: [Intel-gfx] linux-next: manual merge of the tip tree with the drm-intel tree

2016-11-08 Thread Daniel Vetter
On Tue, Nov 08, 2016 at 06:04:15PM +0100, Peter Zijlstra wrote: > On Tue, Nov 08, 2016 at 05:09:16PM +0100, Daniel Vetter wrote: > > > Now, I know you're working on getting rid of this entirely for i915, but > > > what about that MSM driver? Will we continue to need it there, is > > > anybody

Re: [Intel-gfx] linux-next: manual merge of the tip tree with the drm-intel tree

2016-11-08 Thread Peter Zijlstra
On Tue, Nov 08, 2016 at 05:09:16PM +0100, Daniel Vetter wrote: > > Now, I know you're working on getting rid of this entirely for i915, but > > what about that MSM driver? Will we continue to need it there, is > > anybody actually maintaining that thing? > > Rob Clark is, and since he's a one-man

Re: [Intel-gfx] linux-next: manual merge of the tip tree with the drm-intel tree

2016-11-08 Thread Peter Zijlstra
On Tue, Nov 08, 2016 at 05:09:16PM +0100, Daniel Vetter wrote: > > You're talking about: > > > > lkml.kernel.org/r/20161007154351.gl3...@twins.programming.kicks-ass.net > > > > ? I got no feedback from you DRM guys on that so I kinda forgot about > > that in the hope we'd not have to do this

Re: [Intel-gfx] linux-next: manual merge of the tip tree with the drm-intel tree

2016-11-08 Thread Daniel Vetter
On Tue, Nov 08, 2016 at 02:24:48PM +0100, Peter Zijlstra wrote: > On Tue, Nov 08, 2016 at 11:44:03AM +0100, Daniel Vetter wrote: > > On Tue, Nov 08, 2016 at 03:25:41PM +1100, Stephen Rothwell wrote: > > > Hi all, > > > > > > FIXME: Add owner of second tree to To: > > >Add author(s)/SOB of

Re: [Intel-gfx] linux-next: manual merge of the tip tree with the drm-intel tree

2016-11-08 Thread Peter Zijlstra
On Tue, Nov 08, 2016 at 11:44:03AM +0100, Daniel Vetter wrote: > On Tue, Nov 08, 2016 at 03:25:41PM +1100, Stephen Rothwell wrote: > > Hi all, > > > > FIXME: Add owner of second tree to To: > >Add author(s)/SOB of conflicting commits. > > > > Today's linux-next merge of the tip tree got

Re: [Intel-gfx] linux-next: manual merge of the tip tree with the drm-intel tree

2016-11-08 Thread Daniel Vetter
On Tue, Nov 08, 2016 at 03:25:41PM +1100, Stephen Rothwell wrote: > Hi all, > > FIXME: Add owner of second tree to To: >Add author(s)/SOB of conflicting commits. > > Today's linux-next merge of the tip tree got a conflict in: > > drivers/gpu/drm/i915/i915_gem_shrinker.c > > between

[Intel-gfx] linux-next: manual merge of the tip tree with the drm-intel tree

2016-11-07 Thread Stephen Rothwell
Hi all, FIXME: Add owner of second tree to To: Add author(s)/SOB of conflicting commits. Today's linux-next merge of the tip tree got a conflict in: drivers/gpu/drm/i915/i915_gem_shrinker.c between commits: 1233e2db199d ("drm/i915: Move object backing storage manipulation to its