From: Kevin Hilman <khilman@deeprootsystems.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,
Chaithrika U S <chaithrika@ti.com>,
Pavel Kiryukhin <pkiryukhin@ru.mvista.com>,
Naresh Medisetty <naresh@ti.com>, Steve Chen <schen@mvista.com>,
Mark Brown <broonie@opensource.wolfsonmicro.com>,
Sudhakar Rajashekhara <sudhakar.raj@ti.com>
Subject: Re: linux-next: manual merge of the sound tree with the davinci tree
Date: Thu, 23 Jul 2009 10:54:44 -0700 [thread overview]
Message-ID: <873a8ni8t7.fsf@deeprootsystems.com> (raw)
In-Reply-To: <s5hvdlkvsk6.wl%tiwai@suse.de> (Takashi Iwai's message of "Thu\, 23 Jul 2009 08\:09\:45 +0200")
Takashi Iwai <tiwai@suse.de> writes:
> At Thu, 23 Jul 2009 11:21:10 +1000,
> Stephen Rothwell wrote:
>>
>> Hi Takashi,
>>
>> Today's linux-next merge of the sound tree got a conflict in
>> sound/soc/davinci/davinci-evm.c between commit
>> 95d0d986d09ac25a5b9f2bf28f289ab0823e86d5 ("davinci: EDMA: multiple CCs,
>> channel mapping and API changes") from the davinci tree and commit
>> 04f80f5c486b39446af44e218dba90ec210d61ca ("ASoC: Add machine driver
>> support for DM646x") from the sound tree.
>>
>> The latter removes the code modified by the former. I have just used the
>> latter.
>
> Thanks. I'll try to resolve the conflict in the sound tree,
> e.g. pulling the affecting commit of davinci tree into for-next
> branch.
I've taken care of this in the DaVinci for-next branch.
I dropped the davinci changes that change code that were then dropped
by the asoc changes.
Kevin
next prev parent reply other threads:[~2009-07-23 17:54 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-07-23 1:21 linux-next: manual merge of the sound tree with the davinci tree Stephen Rothwell
2009-07-23 6:09 ` Takashi Iwai
2009-07-23 17:54 ` Kevin Hilman [this message]
2009-07-23 23:10 ` Takashi Iwai
2009-07-24 1:12 ` Stephen Rothwell
2009-07-24 0:38 ` 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=873a8ni8t7.fsf@deeprootsystems.com \
--to=khilman@deeprootsystems.com \
--cc=broonie@opensource.wolfsonmicro.com \
--cc=chaithrika@ti.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=naresh@ti.com \
--cc=pkiryukhin@ru.mvista.com \
--cc=schen@mvista.com \
--cc=sfr@canb.auug.org.au \
--cc=sudhakar.raj@ti.com \
--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.