linux-kernel - linux-next: manual merge of the arm-soc tree with the sound 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, 25 Sep 2012 16:44:58 +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>,
	Takashi Iwai <tiwai@...e.de>, Tony Lindgren <tony@...mide.com>
Subject: linux-next: manual merge of the arm-soc tree with the sound tree

Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in
sound/soc/omap/omap-mcbsp.c between commit 04564e325830 ("ASoC: OMAP:
mcbsp, mcpdm, dmic: Let omap-pcm to pick the dma_type") from the sound
tree and commits 7d7e1eba7e92 ("ARM: OMAP2+: Prepare for irqs.h removal")
and 2203747c9771 ("ARM: omap: move platform_data definitions") from the
arm-soc tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

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

diff --cc sound/soc/omap/omap-mcbsp.c
index fef2f59,1b186277..0000000
--- a/sound/soc/omap/omap-mcbsp.c
+++ b/sound/soc/omap/omap-mcbsp.c
@@@ -34,7 -32,9 +34,8 @@@
  #include <sound/initval.h>
  #include <sound/soc.h>

- #include <plat/mcbsp.h>
+ #include <plat/cpu.h>
 -#include <plat/dma.h>
+ #include <linux/platform_data/asoc-ti-mcbsp.h>
  #include "mcbsp.h"
  #include "omap-mcbsp.h"
  #include "omap-pcm.h"

Content of type "application/pgp-signature" skipped