* linux-next: manual merge of the sound tree with the davinci tree
@ 2009-07-23 1:21 Stephen Rothwell
2009-07-23 6:09 ` Takashi Iwai
0 siblings, 1 reply; 6+ messages in thread
From: Stephen Rothwell @ 2009-07-23 1:21 UTC (permalink / raw)
To: Takashi Iwai
Cc: linux-next, linux-kernel, Chaithrika U S, Pavel Kiryukhin,
Naresh Medisetty, Steve Chen, Mark Brown, Sudhakar Rajashekhara,
Kevin Hilman
[-- Attachment #1: Type: text/plain, Size: 571 bytes --]
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.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: linux-next: manual merge of the sound tree with the davinci tree
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
0 siblings, 1 reply; 6+ messages in thread
From: Takashi Iwai @ 2009-07-23 6:09 UTC (permalink / raw)
To: Stephen Rothwell
Cc: linux-next, linux-kernel, Chaithrika U S, Pavel Kiryukhin,
Naresh Medisetty, Steve Chen, Mark Brown, Sudhakar Rajashekhara,
Kevin Hilman
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.
Takashi
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: linux-next: manual merge of the sound tree with the davinci tree
2009-07-23 6:09 ` Takashi Iwai
@ 2009-07-23 17:54 ` Kevin Hilman
2009-07-23 23:10 ` Takashi Iwai
2009-07-24 0:38 ` Stephen Rothwell
0 siblings, 2 replies; 6+ messages in thread
From: Kevin Hilman @ 2009-07-23 17:54 UTC (permalink / raw)
To: Takashi Iwai
Cc: Stephen Rothwell, linux-next, linux-kernel, Chaithrika U S,
Pavel Kiryukhin, Naresh Medisetty, Steve Chen, Mark Brown,
Sudhakar Rajashekhara
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
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: linux-next: manual merge of the sound tree with the davinci tree
2009-07-23 17:54 ` Kevin Hilman
@ 2009-07-23 23:10 ` Takashi Iwai
2009-07-24 1:12 ` Stephen Rothwell
2009-07-24 0:38 ` Stephen Rothwell
1 sibling, 1 reply; 6+ messages in thread
From: Takashi Iwai @ 2009-07-23 23:10 UTC (permalink / raw)
To: Kevin Hilman
Cc: Stephen Rothwell, linux-next, linux-kernel, Chaithrika U S,
Pavel Kiryukhin, Naresh Medisetty, Steve Chen, Mark Brown,
Sudhakar Rajashekhara
At Thu, 23 Jul 2009 10:54:44 -0700,
Kevin Hilman wrote:
>
> 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.
Ah, great. Then I revert a fix merge in my for-next branch and keep
only pure ASoC things.
Thanks!
Takashi
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: linux-next: manual merge of the sound tree with the davinci tree
2009-07-23 23:10 ` Takashi Iwai
@ 2009-07-24 1:12 ` Stephen Rothwell
0 siblings, 0 replies; 6+ messages in thread
From: Stephen Rothwell @ 2009-07-24 1:12 UTC (permalink / raw)
To: Takashi Iwai
Cc: Kevin Hilman, linux-next, linux-kernel, Chaithrika U S,
Pavel Kiryukhin, Naresh Medisetty, Steve Chen, Mark Brown,
Sudhakar Rajashekhara
[-- Attachment #1: Type: text/plain, Size: 555 bytes --]
Hi Takashi, Kevin,
On Fri, 24 Jul 2009 01:10:50 +0200 Takashi Iwai <tiwai@suse.de> wrote:
>
> At Thu, 23 Jul 2009 10:54:44 -0700,
> Kevin Hilman wrote:
> >
> > 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.
>
> Ah, great. Then I revert a fix merge in my for-next branch and keep
> only pure ASoC things.
Thanks.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: linux-next: manual merge of the sound tree with the davinci tree
2009-07-23 17:54 ` Kevin Hilman
2009-07-23 23:10 ` Takashi Iwai
@ 2009-07-24 0:38 ` Stephen Rothwell
1 sibling, 0 replies; 6+ messages in thread
From: Stephen Rothwell @ 2009-07-24 0:38 UTC (permalink / raw)
To: Kevin Hilman
Cc: Takashi Iwai, linux-next, linux-kernel, Chaithrika U S,
Pavel Kiryukhin, Naresh Medisetty, Steve Chen, Mark Brown,
Sudhakar Rajashekhara
[-- Attachment #1: Type: text/plain, Size: 382 bytes --]
Hi Kevin,
On Thu, 23 Jul 2009 10:54:44 -0700 Kevin Hilman <khilman@deeprootsystems.com> wrote:
>
> 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.
Thanks.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2009-07-24 1:12 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
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
2009-07-23 23:10 ` Takashi Iwai
2009-07-24 1:12 ` Stephen Rothwell
2009-07-24 0:38 ` Stephen Rothwell
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).