On Wednesday 02 December 2015 14:49:52 Gregory CLEMENT wrote: > > > least initially. The conflict will go away once it's tested sufficiently and > > I'm pulling it back. > > By the way, when you will pull our tree, we will still have it our own > mvebu/for-next branch. Will git managed to automagically resolve the > conflict by getting the resolution you will do in your branch? Yes, that should be fine, unless you resolve the same conflict differently. > A another solution could be to have a separate patch for the > arch/arm/Kconfig file that you keep in arm-soc. No, I don't think that will be necessary. Arnd -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
