Messages in this thread | | | Date | Wed, 3 Jun 2015 19:21:06 +1000 | From | Stephen Rothwell <> | 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@canb.auug.org.au [unhandled content-type:application/pgp-signature] | |