On Wed, Mar 16, 2011 at 3:54 PM, Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx> wrote: > On Thu, Mar 17, 2011 at 09:50:16AM +1100, Stephen Rothwell wrote: > >> 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. > > I wouldn't even need to create a branch, that doesn't make any practical > difference over working directly with the commit ID. Colin wasn't > enthusiastic about merging the fairly active ASoC tree into Tegra, and > the Tegra side changes depend on other Tegra changes so the reverse > merge was an issue also. > > Given how trivial the change is it may as well just get dropped in in > -rc1 - I really don't understand the handwringing here. > The only issue is that the branch that is being merged by linux-next is untestable on it's own. But we can ignore the problem until the asoc tree is merged into master, at which point the problem goes away. I plan to send a second pull request to Linus as soon as asoc is in, we shouldn't need to wait for rc1. We made sure the patches that depend on the asoc tree are at the top of the stack for 2.6.39. I do my testing on the last patch that compiles without asoc (which is what got pulled into master today), and rely on the people working with the board that depends on asoc to test the last few patches. -- 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
