Thread (6 messages) 6 messages, 4 authors, 2011-07-21

conflicts between omap/cleanup branch and omap_dss2 tree

From: arnd@arndb.de (Arnd Bergmann)
Date: 2011-07-17 21:39:32
Also in: linux-omap

Hi Paul and Tomi,

I'm trying to get the arm-soc tree integrated into linux-next, but right
now that fails because of lots of conflicts in the arch/arm/mach-omap2/clock44xx_data.c
and arch/arm/mach-omap2/omap_hwmod_44xx_data.c files.

I've done a dumb resolution by pulling in the omap_dss2/for_next tree as a
depedency and taking Tomi's version of the files, which is probably wrong 
but lets Stephen at least take the arm-soc tree.

Please fix this properly in either the omap or the omap_dss2 trees.

	Arnd
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help