On 20-07-08 21:08, Jaroslav Kysela wrote:
> On Sun, 20 Jul 2008, Rene Herman wrote:
>> Is there something wrong with your devel branch or is it me?
>
> I think that you have to recommit your patches on top of new Takashi's
> tree, because Takashi rebased his tree on top of Linus's tree.
Hmm. If Takashi did not just now change something, then something that I
don't understand is happening since right now it's working fine:
rene@7ixe4:~/src/linux/7ixe4$ git remote show tiwai
* remote tiwai
URL: git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
Tracked remote branches
devel dma-fix for-linus master upstream
rene@7ixe4:~/src/linux/7ixe4$ git checkout -b alsa v2.6.26
Switched to a new branch "alsa"
rene@7ixe4:~/src/linux/7ixe4$ git pull tiwai devel
Updating bce7f79..e0bf09b
Fast forward
[ ... ]
... and a clean merge. Takashi, if you did -- it's fixed.. :-/
Rene.
_______________________________________________
Alsa-devel mailing list
Alsa-devel@xxxxxxxxxxxxxxxx
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
