On Mon, Mar 7, 2011 at 12:04 PM, Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx> wrote: > On Mon, Mar 07, 2011 at 11:59:02AM -0800, Colin Cross wrote: > >> linux-next. There shouldn't be any conflicts with linux-next, and >> there is no need for linux-next to build after merging some of its >> branches. > > -next gets built after each merge so the tree does need to merge without > the trees that get merged later on. Ok, we can make sure Tegra is merged after i2c and asoc, in which case it should build fine. -- To unsubscribe from this list: send the line "unsubscribe linux-tegra" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html