[alsa-devel] [PATCH 03/11] wss_lib: rename cs4321_foo to wss_foo

[Takashi Iwai]

At Fri, 08 Aug 2008 13:28:37 +0200,
Rene Herman wrote:
> 
> On 05-08-08 11:45, Takashi Iwai wrote:
> 
> > I've changed the tree structure in my git repo, so I added your
> > Reviewed-by tags to all wss-lib patches now.
> 
> I see them, including the MODE_RUNNING changelog addition. Thanks.
> 
> 
> > Now, the tree contains various topic/* branches.  For example,
> > topic/wss-lib holds the whole series of wss and related patches, and
> > topic/asoc holds ASoC-related patches.  The master and other branches
> > merge the topic branches appropriately.  In this way, the patches can
> > be sorted nicely and rebase can be avoided better as well.
> > 
> > Also, some topic branches are for experimental patches that aren't yet
> > merged.  For example, topic/hda-reconfig contains my HD-audio dynamic
> > reconfig patches, and topic/modem-integrate contains MC97 integration
> > patches.
> > 
> > The git URL is:
> >   git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git
> > 
> > and gitweb is:
> >   http://git.kernel.org/?p=linux/kernel/git/tiwai/sound-2.6.git;a=summary
> 
> I see. That stopped me for a bit.
> 
> I used to pull your devel branch directly into v2.6.26 which worked 
> nicely, what with that branch being based at v2.6.26. topic/wss-lib now 
> though is based at v2.6.27-rc1 meaning pulling it pulled in all of 
> 2.6.27-rc1 as well.
> 
> I understand why; the wss-lib patches were dependent on some earlier 
> opti9xx patches that are in 2.6.27-rc1 but I specifically this cycle 
> decided to stay on -stable for a bit and not allow myself to be 
> continously sidetracked by all sorts of problems in those megabytes upon 
> megabytes of unrelated changes in the upstream kernel. Last cycle was 
> particularly bad.
> 
> So I was just now cherry-picking the WSS patches and its dependents into 
> a local topic/wss-lib when I decided to give it up after all and just go 
> to 2.6.27-rc2. I'm debugging a PAT related problem in 2.6.27 anyway so I 
> guess the attempt _already_ failed independent of ALSA. <sob>.
> 
> Hey, now I get to side-track myself with Merkey's kernel debugger...
> 
> Anyways -- what's the status of devel (topic/devel now I see) now? Is 
> that still going to be a branch that's just current ALSA, pullable into 
> current release? Worked great for me but if it's too much trouble to 
> maintain, I can appreciate that and will just cherry-pick/rebase things 
> myself locally I guess.


I originally wanted to keep the devel branch based on 2.6.26, but due
to this reorganization, I had to remove it because it's no longer easy
to track (and actually missed some changes in Documentation
directory).

The topic/devel branch keeps the patches that don't belong to other
topic branches.  The master and for-next branches eventually merge
topic branches for a single pull.  The merge is continuous (unless any
severe conflicts) so that you can keep pulling.

So, right now, there is no 2.6.26-branch.  Sorry.
But, topic branches will remain as they are, so for 2.6.28, it'll be
easier to track.  You can just pull topic branches you need to
2.6.27.


Takashi