[alsa-devel] [PATCH 1/4] MFD: twl4030: add twl4030_codec MFD as a new child to the core
peter.ujfalusi at nokia.com
Thu Oct 22 13:02:08 CEST 2009
On Thursday 22 October 2009 13:55:17 ext Mark Brown wrote:
> On Thu, Oct 22, 2009 at 09:57:49AM +0200, Samuel Ortiz wrote:
> > It seems to me that this patchset is mostly an asoc one, even though all
> > of those patches depend on the MFD one. So I'd perfectly fine if they'd
> > all go through Mark's tree, and then I'd have to make sure I'm sending my
> > 2.6.33 merge window pull request _after_ Mark's code is in Linus tree.
> > Once it's there, I can work on merging conflicts with the few
> > twl4030-core pending patches from my tree. Mark, what do you think ?
> Seems reasonable. I'll apply them on a separate branch and merge them
> into my 2.6.33 branch so that you can merge them into your tree too and
> avoid any cross-tree issues without needing to think about how things
> get merged with Linus (though since Takashi generally merges early it'll
> probably happen naturally anyway). Note that if you do pull this branch
> you won't be able to rebase your tree, you'd have to merge up Linus'
> tree instead (but that'd be handy anyway :) ).
I just sent the second series, I'll hope the I have not missed anything.
I was scratching my head on which tree it should be going, but it is really nice
to see that it can be done like this.
Thank you Samuel, Mark and Tony!
More information about the Alsa-devel