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

Date:	Thu, 20 Sep 2012 16:06:37 +1000
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,
	Peter Ujfalusi <peter.ujfalusi@...com>,
	Mark Brown <broonie@...nsource.wolfsonmicro.com>,
	Liam Girdwood <lrg@...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 conflicts in
sound/soc/omap/igep0020.c, sound/soc/omap/omap3beagle.c,
sound/soc/omap/omap3evm.c and sound/soc/omap/overo.c between commit
152c6e56f6a8 ("ASoC: Remove obsolete OMAP3 machine drivers") from the
sound-asoc tree and commit 2203747c9771 ("ARM: omap: move platform_data
definitions") from the arm-soc tree.

The former removed the files, so I did that and can carry the fix as
necessary (no action is required).

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

Content of type "application/pgp-signature" skipped