[alsa-devel] ASoC updates for 2.6.32

Mark Brown broonie at opensource.wolfsonmicro.com
Fri Nov 6 16:06:54 CET 2009

On Fri, Nov 06, 2009 at 03:37:14PM +0100, Takashi Iwai wrote:

> It's fine to keep the fix branch forwarding after the merge.  Feel
> free to do that in your side.

OK, I'll do that.  You're not concerned about this giving you the effect
of back merging into your for-linus branches, or do you throw those away
and regenerate them anyway?

> My only point is that the backward merge from the upstream isn't
> regarded as a good thing.


> Well, I myself don't mind much, but Linus would do.
> That's why I'm asking.

I wasn't aware of this.  I know he had issues with merging up of random
not particularly tested commits (I don't like that either, especially in
the merge window) but he had said he was OK with merging up tagged

Like I say, it's mostly just for my mental model of what's going on -
the fact that there are these topic branches and they're kept around is
what's telling me to do things this way.

More information about the Alsa-devel mailing list