linux-kernel - linux-next: manual merge of the init 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: <20150603192106.1d30ff5a@canb.auug.org.au>
Date:	Wed, 3 Jun 2015 19:21:06 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Paul Gortmaker <paul.gortmaker@...driver.com>,
	Russell King <linux@....linux.org.uk>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: linux-next: manual merge of the init tree with the arm tree

Hi Paul,

Today's linux-next merge of the init tree got a conflict in
arch/arm/mach-keystone/platsmp.c between commit 7517021b8a32 ("ARM:
redo TTBR setup code for LPAE") from the arm tree and commit
5639d871ecb2 ("arm/mach-keystone: remove legacy __cpuinit sections that
crept in") from the init tree.

I fixed it up (the former removed the code modified by the latter) and
can carry the fix as necessary (no action is required).

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

Content of type "application/pgp-signature" skipped