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

Hi, On 17/06/13 07:21, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the fbdev tree got a conflict in > drivers/video/of_display_timing.c between commit f583662347c6 ("video: > display_timing: make parameter const") from the drm tree and commits > fcf7e6e5bd84 ("videomode: don

linux-next: manual merge of the fbdev tree with the drm tree

Hi all, Today's linux-next merge of the fbdev tree got a conflict in drivers/video/of_display_timing.c between commit f583662347c6 ("video: display_timing: make parameter const") from the drm tree and commits fcf7e6e5bd84 ("videomode: don't allocate mem in of_get_display_timing()") and ffa3fd21de8