linux-kernel - linux-next: manual merge of the arm-soc tree with the v4l-dvb 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]

Date:	Mon, 24 Sep 2012 19:10:53 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	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,
	Timo Kokkonen <timo.t.kokkonen@....fi>,
	Mauro Carvalho Chehab <mchehab@...radead.org>,
	Tony Lindgren <tony@...mide.com>
Subject: linux-next: manual merge of the arm-soc tree with the v4l-dvb tree

Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/mach-omap2/board-rx51-peripherals.c between commit 322c183cdc5f
("[media] ARM: mach-omap2: board-rx51-peripherals: Add lirc-rx51 data")
from the v4l-dvb tree and commits 2203747c9771 ("ARM: omap: move
platform_data definitions") and 606281525fb7 ("ARM: OMAP2+: Make
gpmc-smc91x.h local") from the arm-soc 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-rx51-peripherals.c
index ca07264,3945c50..0000000
--- a/arch/arm/mach-omap2/board-rx51-peripherals.c
+++ b/arch/arm/mach-omap2/board-rx51-peripherals.c
@@@ -30,13 -33,9 +33,10 @@@
  #include "common.h"
  #include <plat/dma.h>
  #include <plat/gpmc.h>
- #include <plat/onenand.h>
- #include <plat/gpmc-smc91x.h>
 +#include <plat/omap-pm.h>
+ #include "gpmc-smc91x.h"
  
- #include <mach/board-rx51.h>
+ #include "board-rx51.h"
  
  #include <sound/tlv320aic3x.h>
  #include <sound/tpa6130a2-plat.h>

Content of type "application/pgp-signature" skipped