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

Hi all, On Wed, 14 Aug 2019 12:54:33 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the drm-misc tree got a conflict in: > > drivers/gpu/drm/amd/amdgpu/amdgpu_object.c > drivers/gpu/drm/i915/i915_vma.c > drivers/gpu/drm/i915/i915_gem_batch_pool.c >

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

Am 14.08.19 um 04:54 schrieb Stephen Rothwell: > Hi all, > > Today's linux-next merge of the drm-misc tree got a conflict in: > >drivers/gpu/drm/amd/amdgpu/amdgpu_object.c >drivers/gpu/drm/i915/i915_vma.c >drivers/gpu/drm/i915/i915_gem_batch_pool.c >