linux-kernel - 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-next>] [day] [month] [year] [list]

Date:	Thu, 23 Jul 2009 11:21:10 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Takashi Iwai <tiwai@...e.de>
Cc:	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>,
	Kevin Hilman <khilman@...prootsystems.com>
Subject: linux-next: manual merge of the sound tree with the davinci tree

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@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped