linux-kernel - linux-next: manual merge of the sound-asoc tree with the s5p 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: <20111205130102.aec262d85aa6b47b0aec7011@canb.auug.org.au>
Date:	Mon, 5 Dec 2011 13:01:02 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Mark Brown <broonie@...nsource.wolfsonmicro.com>,
	Liam Girdwood <lrg@...mlogic.co.uk>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Kukjin Kim <kgene.kim@...sung.com>
Subject: linux-next: manual merge of the sound-asoc tree with the s5p tree

Hi all,

Today's linux-next merge of the sound-asoc tree got a conflict in
arch/arm/mach-s3c64xx/mach-crag6410.c between commit c5c32c965dad ("ARM:
S3C64XX: Hook up Littlemill audio card on Cragganmore") from the s5p tree
and commit 6414261f0a2a ("ASoC: Rename Speyside WM8962 to Tobermory")
from the sound-asoc tree.

Just context changes.  I fixed it up (see below) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc arch/arm/mach-s3c64xx/mach-crag6410.c
index 6ff76c0,55c0e75..0000000
--- a/arch/arm/mach-s3c64xx/mach-crag6410.c
+++ b/arch/arm/mach-s3c64xx/mach-crag6410.c
@@@ -346,8 -338,7 +346,8 @@@ static struct platform_device *crag6410
  	&crag6410_lcd_powerdev,
  	&crag6410_backlight_device,
  	&speyside_device,
- 	&speyside_wm8962_device,
+ 	&tobermory_device,
 +	&littlemill_device,
  	&lowland_device,
  	&wallvdd_device,
  };

Content of type "application/pgp-signature" skipped