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

2016-06-22 Thread Russell King
On Wed, Jun 22, 2016 at 10:23:36AM +0200, Daniel Vetter wrote: > On Wed, Jun 22, 2016 at 09:21:11AM +0100, Russell King wrote: > > On Wed, Jun 22, 2016 at 09:31:18AM +0200, Daniel Vetter wrote: > > > On Wed, Jun 22, 2016 at 3:47 AM, Stephen Rothwell > > > wrote: > > > > Hi all, > > > > > > > > To

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

2016-06-22 Thread Russell King
On Wed, Jun 22, 2016 at 09:31:18AM +0200, Daniel Vetter wrote: > On Wed, Jun 22, 2016 at 3:47 AM, Stephen Rothwell > wrote: > > Hi all, > > > > Today's linux-next merge of the drm-misc tree got a conflict in: > > > > drivers/gpu/drm/sti/sti_drv.c > > > > between commit: > > > > 062993b15e8e (

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

2016-06-22 Thread Daniel Vetter
On Wed, Jun 22, 2016 at 3:47 AM, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the drm-misc tree got a conflict in: > > drivers/gpu/drm/sti/sti_drv.c > > between commit: > > 062993b15e8e ("drm: convert DT component matching to > component_match_add_release()") Why did tha

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

2016-06-22 Thread Daniel Vetter
On Wed, Jun 22, 2016 at 09:21:11AM +0100, Russell King wrote: > On Wed, Jun 22, 2016 at 09:31:18AM +0200, Daniel Vetter wrote: > > On Wed, Jun 22, 2016 at 3:47 AM, Stephen Rothwell > > wrote: > > > Hi all, > > > > > > Today's linux-next merge of the drm-misc tree got a conflict in: > > > > > >