From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Takashi Iwai <tiwai@suse•de>
Cc: linux-next@vger•kernel.org, eric miao <eric.y.miao@gmail•com>,
Russell King <rmk@arm•linux.org.uk>
Subject: Re: linux-next: manual merge of the sound tree
Date: Tue, 15 Jul 2008 17:15:25 +1000 [thread overview]
Message-ID: <20080715171525.fbb0d94c.sfr@canb.auug.org.au> (raw)
In-Reply-To: <s5hk5fnwtr5.wl%tiwai@suse.de>
[-- Attachment #1: Type: text/plain, Size: 426 bytes --]
Hi Takashi,
On Tue, 15 Jul 2008 08:23:26 +0200 Takashi Iwai <tiwai@suse•de> wrote:
>
> I already rebased my tree to the latest Linus tree, and there was no
> conflict indeed. So, simply drop sound tree from linux-next for today
> :) The merge on tomorrow should be fine.
Too late, its already merged! :-)
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
next prev parent reply other threads:[~2008-07-15 7:15 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-07-15 5:47 linux-next: manual merge of the sound tree Stephen Rothwell
2008-07-15 6:23 ` Takashi Iwai
2008-07-15 7:15 ` Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2008-09-01 4:20 Stephen Rothwell
2008-09-01 4:36 ` David Miller
2008-09-01 5:53 ` Takashi Iwai
2008-09-01 8:28 ` David Miller
2008-09-01 8:34 ` Takashi Iwai
2008-09-01 9:03 ` Stephen Rothwell
2008-09-01 9:26 ` Takashi Iwai
2008-09-01 9:44 ` David Miller
2008-12-15 4:25 Stephen Rothwell
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=20080715171525.fbb0d94c.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=eric.y.miao@gmail$(echo .)com \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=rmk@arm$(echo .)linux.org.uk \
--cc=tiwai@suse$(echo .)de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox