On Fri, Jan 21, 2011 at 02:41:08PM -0800, Colin Cross wrote: > Could the same platform_data patch go into both ASoC and Tegra? It > would fall out in the merge, no matter who gets pulled first. If we > go that route, whichever place you put the header, one of the trees > will have an include file that is in the other tree's directory. The usual thing here would be a branch that gets merged into both trees (to avoid the commit getting duplicated) or to only apply in one tree and let things sort themselves out in -next and the merge window. > I still think the header makes more sense in include/sound than > mach-tegra, but if the ASoC maintainers prefer it in mach-tegra, > consider the patch Acked-by: Colin Cross <ccross@xxxxxxxxxxx> for > inclusion in the ASoC tree. The general style for architecture specific headers is that they get included in architecture specific directories to avoid general namespace pollution. -- 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