From: Takashi Iwai Subject: Re: The new alsa-driver repository Date: Mon, 17 Dec 2012 17:12:41 +0100 Message-ID: References: <50CF3FBC.7010309@perex.cz> Mime-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mx2.suse.de (cantor2.suse.de [195.135.220.15]) by alsa0.perex.cz (Postfix) with ESMTP id 5476B264F3D for ; Mon, 17 Dec 2012 17:12:42 +0100 (CET) In-Reply-To: <50CF3FBC.7010309@perex.cz> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org To: Jaroslav Kysela Cc: ALSA development List-Id: alsa-devel@alsa-project.org At Mon, 17 Dec 2012 16:52:28 +0100, Jaroslav Kysela wrote: > > Hello all, > > the ALSA server has new alsa-driver repository which contains several > branches for now: > > master - just empty one with README > build - the previous master branch > (but all was moved to the alsa/ subtree) > mirror - mirrored code from upstream (ALSA parts only) > release - merging branch for mirror/build trees to create > a relationship between them > > All branches are ophan. It means that they have no common parent. > > I put some handy configuration hints to the ALSA WIKI: > > http://www.alsa-project.org/main/index.php/GIT_Server#Syncing_the_branch_release_in_alsa-driver.git > > The reason to move the old master branch to the alsa/ subtree is quite > simple - you can merge/pull the branch to the full linux-2.6 kernel tree > now and do your development there. Also, cherry picks between mirror and > the linux-2.6 tree should work. > > Another handy extension - in the current repo - might be to create the > linux-2.6 branch with the whole upstream and create another branch for > merging the build branch with the whole tree like 'release26' or so. In > this way, we can manage another releases of the out-of-kernel build code > for the ALSA tree in stable linux kernel versions. > > Comments, other ideas are welcome. I haven't looked at details yet, but it sounds like a good move, judging from your description. Thanks! Will check more in tomorrow. Takashi