From: Takashi Iwai <tiwai@suse.de>
To: Kumar Gala <galak@kernel.crashing.org>
Cc: linuxppc-dev@ozlabs.org, alsa-devel@alsa-project.org,
Timur Tabi <timur@freescale.com>
Subject: Re: [alsa-devel] [PATCH v3] [POWERPC] Update MPC8610 HPCD to support audio drivers
Date: Fri, 18 Jan 2008 16:40:04 +0100 [thread overview]
Message-ID: <s5hy7anb0rv.wl%tiwai@suse.de> (raw)
In-Reply-To: <1B0EDDAA-B8DE-44C8-B9BE-959B81B4F7C8@kernel.crashing.org>
At Fri, 18 Jan 2008 09:18:14 -0600,
Kumar Gala wrote:
>
>
> On Jan 18, 2008, at 8:48 AM, Timur Tabi wrote:
>
> > Kumar Gala wrote:
> >
> >> Can you respin this. It doesn't apply cleanly to my tree.
> >
> > Ok, but I have a feeling that the merge between alsa-git and powerpc-
> > git is going to be ugly.
>
> Really, it would seem ok in that the powerpc stuff is only touch files
> under arch/powerpc. So as long as the alsa is only touching files in
> drivers/ I think we'll be ok. 8610 my bitch a bit until the two exist
> in one place.
The alsa tree doesn't touch ppc tree. It includes only only Timur's
second patch, not the first part touching arch/powerpc. So, merging
both trees shouldn't conflict.
Takashi
prev parent reply other threads:[~2008-01-18 15:40 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-01-10 22:44 [PATCH 0/2] ASoC drivers for the Freescale MPC8610 SoC Timur Tabi
2008-01-10 22:44 ` [PATCH v3] [POWERPC] Update MPC8610 HPCD to support audio drivers Timur Tabi
2008-01-10 22:44 ` [PATCH v2] [ALSA] Add ASoC drivers for the Freescale MPC8610 SoC Timur Tabi
2008-01-10 23:02 ` Grant Likely
2008-01-10 23:12 ` [alsa-devel] " Timur Tabi
2008-01-10 23:17 ` Grant Likely
2008-01-10 23:19 ` Timur Tabi
2008-01-11 0:24 ` Olof Johansson
2008-01-11 15:08 ` Timur Tabi
2008-01-10 22:52 ` [PATCH v3] [POWERPC] Update MPC8610 HPCD to support audio drivers Grant Likely
2008-01-10 23:00 ` Scott Wood
2008-01-18 6:48 ` Kumar Gala
2008-01-18 14:48 ` [alsa-devel] " Timur Tabi
2008-01-18 15:18 ` Kumar Gala
2008-01-18 15:40 ` Takashi Iwai [this message]
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=s5hy7anb0rv.wl%tiwai@suse.de \
--to=tiwai@suse.de \
--cc=alsa-devel@alsa-project.org \
--cc=galak@kernel.crashing.org \
--cc=linuxppc-dev@ozlabs.org \
--cc=timur@freescale.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).