On Sun, 23 Sep 2012, Tony Lindgren wrote: > OK thanks, that should work. The nasty merge conflicts seem to have been > caused by mostly commit df3d17e0 (ARM: pmu: remove arm_pmu_type enumeration) > that easily causes a nasty mis-merge of omap_init_pmu() and omap_init_rng() > without removing omap_init_pmu() which your patches move to a different > location.
OK thanks. From now on, will make sure that merge window pull requests are based on any upstream cleanup series that affect the same code. - Paul -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
