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]

Message-Id: <20120924173024.f102e9efb9b24d2b275509be@canb.auug.org.au>
Date:	Mon, 24 Sep 2012 17:30:24 +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,
	"Hebbar, Gururaja" <gururaja.hebbar@...com>,
	Mark Brown <broonie@...nsource.wolfsonmicro.com>,
	Takashi Iwai <tiwai@...e.de>
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
arch/arm/mach-davinci/davinci.h between commit 896f66b7de29 ("ASoC/ARM:
Davinci: McASP: split asp header into platform and audio specific") from
the sound tree and commit ec2a0833e515 ("ARM: davinci: 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 arch/arm/mach-davinci/davinci.h
index 8661b20,a37fc44..0000000
--- a/arch/arm/mach-davinci/davinci.h
+++ b/arch/arm/mach-davinci/davinci.h
@@@ -22,11 -22,10 +22,11 @@@
  #include <linux/davinci_emac.h>
  #include <linux/platform_device.h>
  #include <linux/spi/spi.h>
 +#include <linux/platform_data/davinci_asp.h>
  
- #include <mach/keyscan.h>
 -#include <mach/asp.h>
+ #include <linux/platform_data/keyscan-davinci.h>
  #include <mach/hardware.h>
 +#include <mach/edma.h>
  
  #include <media/davinci/vpfe_capture.h>
  #include <media/davinci/vpif_types.h>

Content of type "application/pgp-signature" skipped