On Sun, 23 Sep 2012, Tony Lindgren wrote: > * Paul Walmsley <paul@xxxxxxxxx> [120922 10:48]: > > > Your tmp-merge contains branch/tag merges that haven't yet gone upstream > > to arm-soc. I don't know which of those merges you consider stable (aside > > from the upstream ones, obviously). > > Well tmp-merge is a merge of the upstream branches, but the branch > itself is temporary. tmp-merge at commit abfee61f contains some branches/tags that aren't upstream at arm-soc - for example, Santosh's omap5_arch_timer (3c7c5da) and my omap-devel-c-for-3.7 (a238ce7). > The issue here is that's it's too messy to get > your branch merged currently because of the various merge conflicts with > other branches. Trying to merge in your updated branch for testing > into tmp-merge with the other branches produces: > > CONFLICT (content): Merge conflict in drivers/spi/spi-omap2-mcspi.c > CONFLICT (content): Merge conflict in arch/arm/mach-omap2/omap_hwmod.c > CONFLICT (content): Merge conflict in arch/arm/mach-omap2/gpmc.c > CONFLICT (content): Merge conflict in arch/arm/mach-omap2/devices.c > CONFLICT (content): Merge conflict in arch/arm/mach-omap2/clkt_dpll.c > CONFLICT (content): Merge conflict in arch/arm/mach-omap2/clkt_clksel.c > CONFLICT (content): Merge conflict in arch/arm/mach-omap2/clkt34xx_dpll3m2.c If you don't want to resolve the conflicts yourself, I'll be happy to do it if you give me a stable commit for me to base my pull request on. But probably those conflicts are due to a miscommunication; see below. > It seems to be conflicting with your own formatting changes, > am33xx changes, PMU changes and RNG changes. The PMU changes and RNG changes are in the tag you're pulling. There aren't any previous changes in those areas from me. Did you drop the temporary merge of omap-devel-c-for-3.7 before pulling omap-devel-b-c-for-3.7? I merged the b (hwmod/etc.) and c (clock) pull requests into the updated pull request to reduce merge conflicts for you. - Paul -- 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
