Re: linux-next: manual merge of the tip tree with the omap_dss2 tree

H all, On Tue, 4 Mar 2014 16:13:20 +1100 Stephen Rothwell wrote: > > Today's linux-next merge of the tip tree got conflicts in > drivers/video/Kconfig, drivers/video/Makefile and drivers/video/sgivwfb.c > between commit 08667731d1d4 ("video: move fbdev to drivers/video/fbdev") > from the omap_ds

linux-next: manual merge of the tip tree with the omap_dss2 tree

Hi all, Today's linux-next merge of the tip tree got conflicts in drivers/video/Kconfig, drivers/video/Makefile and drivers/video/sgivwfb.c between commit 08667731d1d4 ("video: move fbdev to drivers/video/fbdev") from the omap_dss2 tree and commit c5f9ee3d665a ("x86, platforms: Remove SGI Visual W

Re: linux-next: manual merge of the tip tree with the omap_dss2 tree

Hi On Wed, Aug 14, 2013 at 6:31 AM, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the tip tree got a conflict in > drivers/video/simplefb.c between commit dbb5ff4c2300 ("simplefb: add > support for a8b8g8r8 pixel format") from the omap_dss2 tree and commit > 5ef76da644bf ("fbd

linux-next: manual merge of the tip tree with the omap_dss2 tree

Hi all, Today's linux-next merge of the tip tree got a conflict in drivers/video/simplefb.c between commit dbb5ff4c2300 ("simplefb: add support for a8b8g8r8 pixel format") from the omap_dss2 tree and commit 5ef76da644bf ("fbdev: simplefb: add init through platform_data") from the tip tree. I fixe