conflicts between omap/cleanup branch and omap_dss2 tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



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
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[Index of Archives]     [Linux Arm (vger)]     [ARM Kernel]     [ARM MSM]     [Linux Tegra]     [Linux WPAN Networking]     [Linux Wireless Networking]     [Maemo Users]     [Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Yosemite Trails]     [Linux Kernel]     [Linux SCSI]

  Powered by Linux