[alsa-devel] GIT: something wrong with sound-2.6/devel?

Rene Herman rene.herman at keyaccess.nl
Sun Jul 20 20:56:20 CEST 2008

Hi Takashi.

Is there something wrong with your devel branch or is it me?

rene at 7ixe4:~/src/linux/7ixe4$ git fetch tiwai
remote: Counting objects: 1695, done.
remote: Compressing objects: 100% (418/418), done.
remote: Total 1418 (delta 1182), reused 1222 (delta 1000)
Receiving objects: 100% (1418/1418), 275.35 KiB, done.
Resolving deltas: 100% (1182/1182), completed with 170 local objects.
 From git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
  ! [rejected]        devel      -> tiwai/devel  (non fast forward)
  ! [rejected]        dma-fix    -> tiwai/dma-fix  (non fast forward)
    3e14b50..9432484  for-linus  -> tiwai/for-linus
  ! [rejected]        master     -> tiwai/master  (non fast forward)
    481c534..50515af  upstream   -> tiwai/upstream
rene at 7ixe4:~/src/linux/7ixe4$ git checkout -b head v2.6.26
Switched to a new branch "head"
rene at 7ixe4:~/src/linux/7ixe4$ git merge tiwai/devel
Auto-merged sound/pci/ac97/ac97_patch.c
Auto-merged sound/pci/emu10k1/emu10k1_main.c
Auto-merged sound/pci/hda/patch_analog.c
Auto-merged sound/pci/hda/patch_realtek.c
CONFLICT (content): Merge conflict in sound/pci/hda/patch_realtek.c
Auto-merged sound/pci/hda/patch_sigmatel.c
Automatic merge failed; fix conflicts and then commit the result.

It's no doubt trivial to fixup, but I believe this should've merged 
cleanly? (the master branch from where I'm branching off head is an 
undisturbed linus tree).


More information about the Alsa-devel mailing list