linux-kernel - linux-next: manual merge of the driver-core 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: <20111228160045.21ef706d279fef338ac5d7e0@canb.auug.org.au>
Date:	Wed, 28 Dec 2011 16:00:45 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Greg KH <greg@...ah.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Kay Sievers <kay.sievers@...y.org>,
	Thomas Abraham <thomas.abraham@...aro.org>,
	Kukjin Kim <kgene.kim@...sung.com>
Subject: linux-next: manual merge of the driver-core tree with the s5p tree

Hi Greg,

Today's linux-next merge of the driver-core tree got a conflict in
arch/arm/mach-exynos/cpu.c between commit f983575aa90c ("ARM: EXYNOS:
Enable conversion of GIC dt irq specifier to linux virq") from the s5p
tree and commit 4a858cfc9af8 ("arm: convert sysdev_class to a regular
subsystem") from the driver-core 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-exynos/cpu.c
index 0e3f42b,d4c41f3..0000000
--- a/arch/arm/mach-exynos/cpu.c
+++ b/arch/arm/mach-exynos/cpu.c
@@@ -9,9 -9,7 +9,9 @@@
  */
  
  #include <linux/sched.h>
- #include <linux/sysdev.h>
+ #include <linux/device.h>
 +#include <linux/of.h>
 +#include <linux/of_irq.h>
  
  #include <asm/mach/map.h>
  #include <asm/mach/irq.h>

Content of type "application/pgp-signature" skipped