lkml.org 
[lkml]   [2015]   [Jun]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subjectlinux-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@canb.auug.org.au
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2015-06-03 12:01    [W:0.025 / U:0.616 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site