From: Mark Brown <broonie@opensource.wolfsonmicro.com>
To: Takashi Iwai <tiwai@suse.de>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Peter Ujfalusi <peter.ujfalusi@nokia.com>,
vikram pandita <vikram.pandita@ti.com>,
Tony Lindgren <tony@atomide.com>
Subject: Re: linux-next: manual merge of the sound tree with the omap tree
Date: Fri, 13 Nov 2009 13:11:48 +0000 [thread overview]
Message-ID: <20091113131148.GC21516@rakim.wolfsonmicro.main> (raw)
In-Reply-To: <s5h1vk2po9n.wl%tiwai@suse.de>
On Fri, Nov 13, 2009 at 02:06:44PM +0100, Takashi Iwai wrote:
> Mark Brown wrote:
> > into the OMAP tree to resolve this. There's some older ASoC changes in
> > there to ensure the patches applied but I'm happy for you to carry those
> > providing Takashi is.
> I can merge the tree above to for-next branch of sound git tree, too.
> In that way, we can keep asoc branches clean.
I believe that creates the same problem both ways :/ . If we merge
OMAP->sound we may as well put it on the ASoC topic branch, it'll
probably be helpful for people doing OMAP work anyway.
next prev parent reply other threads:[~2009-11-13 13:11 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-11-13 2:19 linux-next: manual merge of the sound tree with the omap tree Stephen Rothwell
2009-11-13 12:39 ` Mark Brown
2009-11-13 13:06 ` Takashi Iwai
2009-11-13 13:11 ` Mark Brown [this message]
2009-11-13 13:14 ` Takashi Iwai
2009-11-13 20:44 ` Tony Lindgren
2009-11-14 3:02 ` Tony Lindgren
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=20091113131148.GC21516@rakim.wolfsonmicro.main \
--to=broonie@opensource.wolfsonmicro.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=peter.ujfalusi@nokia.com \
--cc=sfr@canb.auug.org.au \
--cc=tiwai@suse.de \
--cc=tony@atomide.com \
--cc=vikram.pandita@ti.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).