On 10-06-08 23:19, Rene Herman wrote:

I have been using Takashi's "sound-2.6" GIT repo:

git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git

for pulling current ALSA (branch master) into the stock kernel tree and while rebuilding stuff thought I'd try switching to the official ALSA GIT repo(s). I'd like to make sure that I am now using the right trees and branches...

I start out locally with a fresh linus clone:

$ git clone git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 local

and then want to pull latest ALSA into it:

$ git remote add alsa git://git.alsa-project.org/alsa-kernel.git $ git remote show alsa

• remote alsa URL: git://git.alsa-project.org/alsa-kernel.git Tracked remote branches for-linus linux-2.6 master

$ git checkout -b current

missing here: $ git fetch alsa

$ git merge alsa/master

Am I using the right tree and branch for this? And is this branch being rebased?

Rene.