linux-kernel - linux-next: manual merge of the arm-soc tree with Linus' 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: <20120315175000.897f1172c296d4a687be0537@canb.auug.org.au>
Date:	Thu, 15 Mar 2012 17:50:00 +1100
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,
	Magnus Damm <damm@...nsource.se>,
	"Rafael J. Wysocki" <rjw@...k.pl>,
	Laurent Pinchart <laurent.pinchart@...asonboard.com>,
	Paul Mundt <lethal@...ux-sh.org>
Subject: linux-next: manual merge of the arm-soc tree with Linus' tree

Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/mach-shmobile/board-mackerel.c between commit 1740d3448012
("ARM: mach-shmobile: mackerel: Reserve DMA memory for the frame buffer")
from Linus' tree and commit 5d7220ec000f ("ARM: mach-shmobile: sh7372
map_io and init_early update") from the arm-soc tree.

The latter moved the code to another file
arch/arm/mach-shmobile/setup-sh7372.c and I have no idea how to fix this
up, so I just removed the change done by the former.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped