linux-kernel - linux-next: manual merge of the arm-soc tree with the sound-asoc 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>] [day] [month] [year] [list]

Date:	Tue, 6 Mar 2012 17:24:45 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Olof Johansson <olof@...om.net>, Arnd Bergmann <arnd@...db.de>,
	<linux-arm-kernel@...ts.infradead.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Shawn Guo <shawn.guo@...aro.org>,
	Mark Brown <broonie@...nsource.wolfsonmicro.com>,
	Liam Girdwood <lrg@...com>, Fabio Estevam <festevam@...il.com>
Subject: linux-next: manual merge of the arm-soc tree with the sound-asoc
 tree

Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/plat-mxc/audmux-v1.c between commit 2405fc9728a3 ("ARM: imx:
merge audmux-v1 and audmux-v2") from the sound-asoc tree and commit
48d795616c73 ("ARM: plat-mxc: audmux-v1: Remove unneeded ifdef's") from
the arm-soc tree.

The former removed this file, so I did that.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

Content of type "application/pgp-signature" skipped