From: Rene Herman <rene.herman@keyaccess.nl>
To: Jaroslav Kysela <perex@perex.cz>
Cc: Takashi Iwai <tiwai@suse.de>, ALSA devel <alsa-devel@alsa-project.org>
Subject: Re: GIT: something wrong with sound-2.6/devel?
Date: Sun, 20 Jul 2008 22:04:37 +0200 [thread overview]
Message-ID: <48839A55.6080304@keyaccess.nl> (raw)
In-Reply-To: <Pine.LNX.4.61.0807202104390.7676@tm8103-a.perex-int.cz>
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.
next prev parent reply other threads:[~2008-07-20 20:02 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-07-20 18:56 GIT: something wrong with sound-2.6/devel? Rene Herman
2008-07-20 19:08 ` Jaroslav Kysela
2008-07-20 19:35 ` Rene Herman
2008-07-20 20:04 ` Rene Herman [this message]
2008-07-21 8:45 ` Rene Herman
2008-07-21 9:51 ` Mark Brown
2008-07-21 10:39 ` Rene Herman
2008-07-21 10:47 ` Mark Brown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=48839A55.6080304@keyaccess.nl \
--to=rene.herman@keyaccess.nl \
--cc=alsa-devel@alsa-project.org \
--cc=perex@perex.cz \
--cc=tiwai@suse.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.