Re: linux-next: manual merge of the drm-misc tree with the drm-intel tree

2017-07-20 Thread Stephen Rothwell
Hi all, The following conflict now exists between the drm and drm-intel trees. On Thu, 20 Jul 2017 11:23:33 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the drm-misc tree got a conflict in: > > drivers/gpu/drm/i915/i915_drv.c > > between commit: > > 99c539bef538 ("drm/i9

Re: linux-next: manual merge of the drm-misc tree with the drm-intel tree

2017-05-24 Thread Stephen Rothwell
Hi Dave, Just cc'ing you as I guess you will need to fix this up at some point. On Tue, 23 May 2017 12:00:32 +1000 Stephen Rothwell wrote: > > Hi all, > > Today's linux-next merge of the drm-misc tree got a conflict in: > > drivers/gpu/drm/i915/intel_display.c > > between commits: > > 1

Re: linux-next: manual merge of the drm-misc tree with the drm-intel tree

2016-05-03 Thread Daniel Vetter
On Tue, May 03, 2016 at 01:24:12PM +1000, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the drm-misc tree got a conflict in: > > drivers/gpu/drm/i915/intel_display.c > > between commits: > > f7e5838bb37d ("drm/i915: Simplify reset_counter handling during atomic > modese