On Tue, Mar 01, 2016 at 06:11:46PM +1100, Stephen Rothwell wrote: > On Tue, 1 Mar 2016 11:25:44 +0900 Mark Brown <broo...@kernel.org> wrote:
> > It'll sort itself out by the time things get merged down into Linus' > > tree, that's why I did it as a revert rather than just dropping the > > patch. Linus generally takes regmap before ALSA. > Well, I have the sound trees before the regmap tree. I also dislike Oh, that's a bit surprising. > having these sort of dependencies between trees. What happens if Linus > does merge the sound tree first? > You already merged part of the regmap tree into the sound-asoc tree, > why not do that again with the fix? I tend to treat things that are real fixes as opposed to things that are test only fixes a bit differently to each other - lots of cross merges get messy, if it's not going to hit someone doing something in a real system I tend to not worry about it too much.
signature.asc
Description: PGP signature
