linux-kernel - linux-next: manual merge of the samsung 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: Windows password security audit tool. GUI, reports in PDF.

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

Message-ID: <20140725102410.44ffa99d@canb.auug.org.au>
Date:	Fri, 25 Jul 2014 10:24:10 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Kukjin Kim <kgene.kim@...sung.com>,
	Russell King <linux@....linux.org.uk>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Uwe Kleine-König 
	<u.kleine-koenig@...gutronix.de>, Tomasz Figa <t.figa@...sung.com>
Subject: linux-next: manual merge of the samsung tree with the arm tree

Hi Kukjin,

Today's linux-next merge of the samsung tree got a conflict in
arch/arm/mach-s5pv210/include/mach/memory.h between commit 3ae4e9812941
("ARM: 8113/1: remove remaining definitions of PLAT_PHYS_OFFSET from
<mach/memory.h>") from the arm tree and commit d78c16ccde96 ("ARM:
SAMSUNG: Remove remaining legacy code") from the samsung tree.

I fixed it up (I just removed the file) and can carry the fix as
necessary (no action is required).

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

Download attachment "signature.asc" of type "application/pgp-signature" (820 bytes)