linux-kernel - linux-next: manual merge of the moduleh 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 for Android: free password hash cracker in your pocket

[<prev] [next>] [day] [month] [year] [list]

Date:	Thu, 11 Aug 2011 15:02:58 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Paul Gortmaker <paul.gortmaker@...driver.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Russell King <rmk@....linux.org.uk>
Subject: linux-next: manual merge of the moduleh tree with the arm tree

Hi Paul,

Today's linux-next merge of the moduleh tree got a conflict in
arch/arm/common/scoop.c between commit 2f8163baada3 ("ARM: gpio: convert
includes of mach/gpio.h and asm/gpio.h to linux/gpio.h") from the arm
tree and commit d8e58c821f3e ("arm: Add export.h to ARM specific files as
required") from the moduleh 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/common/scoop.c
index 1cde34a,98288e4..0000000
--- a/arch/arm/common/scoop.c
+++ b/arch/arm/common/scoop.c
@@@ -17,6 -16,8 +17,7 @@@
  #include <linux/slab.h>
  #include <linux/platform_device.h>
  #include <linux/io.h>
+ #include <linux/export.h>
 -#include <asm/gpio.h>
  #include <asm/hardware/scoop.h>
  
  /* PCMCIA to Scoop linkage
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/