Re: [Intel-gfx] duplicated patch on drm-intel-nightly

2016-02-22 Thread Jani Nikula
On Sat, 20 Feb 2016, Rodrigo Vivi wrote: > We have a duplicated patch on drm-intel-nightly > > commits d7006964d and cc1de6e80 [I snipped the extra trailing 'q' off the 2nd commit id.] > causing: > > drivers/gpu/drm//amd/amdgpu/amdgpu_ttm.c:818:6: error: redefinition of > ‘amdgpu_ttm_tt_affect_u

[Intel-gfx] duplicated patch on drm-intel-nightly

2016-02-19 Thread Rodrigo Vivi
Hi all, We have a duplicated patch on drm-intel-nightly commits d7006964d and cc1de6e80q causing: drivers/gpu/drm//amd/amdgpu/amdgpu_ttm.c:818:6: error: redefinition of ‘amdgpu_ttm_tt_affect_userptr’ bool amdgpu_ttm_tt_affect_userptr(struct ttm_tt *ttm, unsigned long start, ^ drivers/gpu