linux-kernel - linux-next: manual merge of the mmc-uh tree with the arm-soc 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: <20141201152202.5a1b4978@canb.auug.org.au>
Date:	Mon, 1 Dec 2014 15:22:02 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Ulf Hansson <ulf.hansson@...aro.org>,
	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,
	Tony Lindgren <tony@...mide.com>,
	Andreas Fenkart <afenkart@...il.com>
Subject: linux-next: manual merge of the mmc-uh tree with the arm-soc tree

Hi Ulf,

Today's linux-next merge of the mmc-uh tree got a conflict in
arch/arm/mach-omap2/board-n8x0.c between commit e639cd5bfc03 ("ARM:
OMAP2+: Prepare to move GPMC to drivers by platform data header") from
the arm-soc tree and commit 826c71a06588 ("ARM: OMAP2: MMC: include
mmc-omap platform header directly") from the mmc-uh 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/mach-omap2/board-n8x0.c
index 49c3c25808e7,e0ad64fde20e..000000000000
--- a/arch/arm/mach-omap2/board-n8x0.c
+++ b/arch/arm/mach-omap2/board-n8x0.c
@@@ -21,7 -21,10 +21,9 @@@
  #include <linux/i2c.h>
  #include <linux/spi/spi.h>
  #include <linux/usb/musb.h>
+ #include <linux/mmc/host.h>
  #include <linux/platform_data/spi-omap2-mcspi.h>
 -#include <linux/platform_data/mtd-onenand-omap2.h>
+ #include <linux/platform_data/mmc-omap.h>
  #include <linux/mfd/menelaus.h>
  #include <sound/tlv320aic3x.h>
  

Content of type "application/pgp-signature" skipped