Hi Mark, On Wed, 16 Mar 2011 22:15:22 +0000 Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx> wrote: > > On Thu, Mar 17, 2011 at 09:10:48AM +1100, Stephen Rothwell wrote: > > > 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. > > We'd need to cherry pick the commits into a branch to create the new > ASoC branch anyway, I can't rebase the tree as it's merged elsewhere. > The need to use the code in the Tegra tree wasn't flagged until too > late. All you would need to do is create a branch (ref) at the last of the necessary commits in the asoc tree and Colin could pull that. This means that Colin will merge a (hopefully not to large) subset of the asoc tree. Or he could just merge the asoc tree as it is today. Either way, the merge commit should contain an explanation. -- Cheers, Stephen Rothwell sfr@xxxxxxxxxxxxxxxx http://www.canb.auug.org.au/~sfr/
Attachment:
pgpS6mv1k0std.pgp
Description: PGP signature
