linux-kernel - Re: linux-next: manual merge of the sound tree with the davinci tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <s5h7hxzngg5.wl%tiwai@suse.de>
Date:	Fri, 24 Jul 2009 01:10:50 +0200
From:	Takashi Iwai <tiwai@...e.de>
To:	Kevin Hilman <khilman@...prootsystems.com>
Cc:	Stephen Rothwell <sfr@...b.auug.org.au>,
	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Chaithrika U S <chaithrika@...com>,
	Pavel Kiryukhin <pkiryukhin@...mvista.com>,
	Naresh Medisetty <naresh@...com>,
	Steve Chen <schen@...sta.com>,
	Mark Brown <broonie@...nsource.wolfsonmicro.com>,
	Sudhakar Rajashekhara <sudhakar.raj@...com>
Subject: Re: linux-next: manual merge of the sound tree with the davinci tree

At Thu, 23 Jul 2009 10:54:44 -0700,
Kevin Hilman wrote:
> 
> Takashi Iwai <tiwai@...e.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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/