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]

Message-Id: <20121210174057.9862b43ff7350ba20c048df3@canb.auug.org.au>
Date:	Mon, 10 Dec 2012 17:40:57 +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,
	Padmavathi Venna <padma.v@...sung.com>,
	Mark Brown <broonie@...nsource.wolfsonmicro.com>,
	Rahul Sharma <rahul.sharma@...sung.com>,
	Kukjin Kim <kgene.kim@...sung.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-samsung/include/plat/devs.h between commit a08485d8fdf6
("ASoC: Samsung: Do not register samsung audio dma device as pdev") from
the sound-asoc tree and commit 0a9d5ac307ae ("ARM: EXYNOS: removing
exynos-drm device registration from non-dt platforms") 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/plat-samsung/include/plat/devs.h
index c45f70c,f53beba..0000000
--- a/arch/arm/plat-samsung/include/plat/devs.h
+++ b/arch/arm/plat-samsung/include/plat/devs.h
@@@ -133,8 -132,7 +132,6 @@@ extern struct platform_device exynos4_d
  extern struct platform_device exynos4_device_pcm2;
  extern struct platform_device exynos4_device_spdif;
  
- extern struct platform_device exynos_device_drm;
- 
 -extern struct platform_device samsung_asoc_dma;
  extern struct platform_device samsung_asoc_idma;
  extern struct platform_device samsung_device_keypad;
  

Content of type "application/pgp-signature" skipped