[Intel-gfx] linux-next: manual merge of the mali-dp tree with the drm-misc tree

Hi Liviu, Today's linux-next merge of the mali-dp tree got a conflict in: drivers/gpu/drm/arm/malidp_planes.c between commit: 81af63a4af82 ("drm: Don't pass clip to drm_atomic_helper_check_plane_state()") from the drm-misc tree and commit: 4968211e7b8f ("drm: mali-dp: Uninitialized

Re: [Intel-gfx] linux-next: manual merge of the mali-dp tree with the drm-misc tree

On Sat, Nov 05, 2016 at 03:55:03AM +1100, Stephen Rothwell wrote: > Hi Liviu, > > On Fri, 4 Nov 2016 15:48:02 + Liviu Dudau wrote: > > > > Brian Starkey is a co-maintainer for the Mali DP tree, so his Signed-off-by > > alone should be good. Baoyou's patch is in my tree

Re: [Intel-gfx] linux-next: manual merge of the mali-dp tree with the drm-misc tree

Hi Liviu, On Fri, 4 Nov 2016 15:48:02 + Liviu Dudau wrote: > > Brian Starkey is a co-maintainer for the Mali DP tree, so his Signed-off-by > alone should be good. Baoyou's patch is in my tree to stop him repeatedly > send me the same patch over and over again :) But yes,

Re: [Intel-gfx] linux-next: manual merge of the mali-dp tree with the drm-misc tree

On Fri, Nov 04, 2016 at 04:38:54PM +1100, Stephen Rothwell wrote: > Hi Liviu, > > On Thu, 3 Nov 2016 17:19:58 + Liviu Dudau wrote: > > > > I have revamped the mali-dp tree and rebased it on the newer > > version of drm-next (which includes the drm-misc change) and pushed

Re: [Intel-gfx] linux-next: manual merge of the mali-dp tree with the drm-misc tree

Hi Liviu, On Thu, 3 Nov 2016 17:19:58 + Liviu Dudau wrote: > > I have revamped the mali-dp tree and rebased it on the newer > version of drm-next (which includes the drm-misc change) and pushed the > updated patch in my tree. Thanks for that. However, several of the

Re: [Intel-gfx] linux-next: manual merge of the mali-dp tree with the drm-misc tree

On Tue, Oct 25, 2016 at 11:20:44AM +1100, Stephen Rothwell wrote: > Hi Liviu, Hi Stephen, > > Today's linux-next merge of the mali-dp tree got a conflict in: > > drivers/gpu/drm/arm/malidp_planes.c > > between commit: > > ea0e1ce20f73 ("drm/arm: Use per-plane rotation property") > >

[Intel-gfx] linux-next: manual merge of the mali-dp tree with the drm-misc tree

Hi Liviu, Today's linux-next merge of the mali-dp tree got a conflict in: drivers/gpu/drm/arm/malidp_planes.c between commit: ea0e1ce20f73 ("drm/arm: Use per-plane rotation property") from the drm-misc tree and commit: 9ebb89762c30 ("drm: mali-dp: Refactor plane initialisation") from