For developers - kernel drivers

Common rules

1) valid 'Signed-off-by:' line must be in the commit text

Rules for alsa-kernel.git

1) subject (first commit text line) must start with '[ALSA] '

Syncing

Note that 'master' branch in alsa-kernel.git is synced with alsa-kmirror.git 'master' branch automatically. So if you add a patch to alsa-kernel.git, it will be merged to alsa-kmirror.git (if no problem occurs) when you initiate 'git push' to the ALSA server.

Note that pushing to 'alsa-kmirror.git' should be only done if:

a) you fixing a sync problem

b) you are modifying a file which is out of sync (scripts directory or so)

In all other cases, only alsa-kernel.git repository should be used.

Common problems

PRE-RECEIVE repositories does not match, please, fix it

The alsa-kmirror.git#mastter and alsa-kernel.git#master sources does not match. You have to do manual changes in alsa-kmirror.git repository to sync trees. A diff between alsa-kmirror.git and alsa-kernel.git is printed to stderr, so you can analyze it and do appropriate steps.

PRE-RECEIVE Patch failed - is it already merged?

Appearently, you're trying to apply a patch which cannot be applied cleanly to alsa-kmirror.git#master. One reason might be that the patch is already applied, but the pre-receive script does not know about it. You may add commiter and commitdate to alsa-kmirror/scripts/git-ok-commits file to skip problematic commit (but only if you really verify, that this commit is already in the alsa-kmirror tree).

Push branch changes to ALSA GIT repository

Note: Especially after 'git rebase' the repository on server is not consistent with local repository (remote ref is not ancestor of the local ref for master branch), so you have to use --force parameter for 'git push' command. Note that this might be dangerous - we probably need to settle a locking mechanism to prevent inconsistent changes.

Branches

master

this branch is for main development (Andrew Morton will get patches for mm tree)

for-linus

this branch is for mainstream tree (for Linus Torvalds)

linux-2.6

this is official linux 2.6 mainstream tree

stable-2.6.<number>

patches for stable 2.6 kernels

private-*

all developers can create a private branch to test a particular set of patches, prefix for these branches is 'private-' (for example private-alsabug-1234, private-tiwai-vmaster etc.)

Tags

Private tags are not allowed. Only tags identifying ALSA version (alsa-kmirror.git and alsa-driver.git) or official linux kernel version (alsa-kernel.git) are allowed.