linux-kernel - linux-next: manual merge of the s5p tree with the arm 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: <20111205110141.90c553323cf5d29fd2c3eeae@canb.auug.org.au>
Date:	Mon, 5 Dec 2011 11:01:41 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Kukjin Kim <kgene.kim@...sung.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Mark Brown <broonie@...nsource.wolfsonmicro.com>,
	Jamie Iles <jamie@...ieiles.com>,
	Russell King <rmk@....linux.org.uk>
Subject: linux-next: manual merge of the s5p tree with the arm tree

Hi Kukjin,

Today's linux-next merge of the s5p tree got a conflict in
arch/arm/mach-s3c64xx/mach-crag6410.c between commit 774b51f8f826 ("ARM:
s3c64xx: convert to MULTI_IRQ_HANDLER") from the arm tree and commit
8504a3cb5cbc ("ARM: S3C64XX: Configure WM1250 EV1 GPIOs on Cragganmore")
from the s5p 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 988ac2e,b2381c1..0000000
--- a/arch/arm/mach-s3c64xx/mach-crag6410.c
+++ b/arch/arm/mach-s3c64xx/mach-crag6410.c
@@@ -37,7 -37,8 +37,9 @@@
  #include <linux/mfd/wm831x/irq.h>
  #include <linux/mfd/wm831x/gpio.h>
  
+ #include <sound/wm1250-ev1.h>
+ 
 +#include <asm/hardware/vic.h>
  #include <asm/mach/arch.h>
  #include <asm/mach-types.h>
  

Content of type "application/pgp-signature" skipped