Hi Colin, On Mon, 14 Mar 2011 13:37:01 -0700 Colin Cross <ccross@xxxxxxxxxx> wrote: > > I am going to push changes to tegra's for-next branch that will only > build after the asoc branch is merged, and will include a merge of a > small part of Ben's next-i2c branch. Can you move tegra after these > branches? > > Should I merge the asoc branch in below the patches that depend on it > in tegra's for-next tree, or should I push a branch that will not > build without merging into linux-next? Sorry I didn't get back to you sooner. I note that some of the tegra code has gone into Linus' tree now. Is the asoc tree you are talking about the sound-asoc tree (git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6.git)? If so, I could move the tegra tree merge to after that. However, I dilike having such dependencies in linux-next and much prefer for the maintainers of the two trees to work it out themselves. The usual way to do that is for (in this case) the asoc tree to have a branch that contains the commits that the tegra tree depends on and for both trees to merge the branch. This is much better than (say) cherry-picking the commits into the tegra tree. The question in my mind is: How are you testing the tegra tree without merging in the asoc tree anyway? -- Cheers, Stephen Rothwell sfr@xxxxxxxxxxxxxxxx http://www.canb.auug.org.au/~sfr/
Attachment:
pgpjQDj0kpsUi.pgp
Description: PGP signature
