* linux-next: manual merge of the init tree with the arm tree
@ 2015-06-03 9:20 Stephen Rothwell
0 siblings, 0 replies; 2+ messages in thread
From: Stephen Rothwell @ 2015-06-03 9:20 UTC (permalink / raw)
To: Paul Gortmaker, Russell King; +Cc: linux-next, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 497 bytes --]
Hi Paul,
Today's linux-next merge of the init tree got a conflict in
arch/arm/mach-hisi/headsmp.S between commit 02b4e2756e01 ("ARM: v7
setup function should invalidate L1 cache") from the arm tree and
commit 43e92446f1d2 ("arm/mach-hisi: remove legacy __CPUINIT section
that crept in") from the init tree.
I fixed it up (the former removed the file) and can carry the fix as
necessary (no action is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
* linux-next: manual merge of the init tree with the arm tree
@ 2015-06-03 9:21 Stephen Rothwell
0 siblings, 0 replies; 2+ messages in thread
From: Stephen Rothwell @ 2015-06-03 9:21 UTC (permalink / raw)
To: Paul Gortmaker, Russell King; +Cc: linux-next, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 514 bytes --]
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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-06-03 9:21 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-06-03 9:20 linux-next: manual merge of the init tree with the arm tree Stephen Rothwell
2015-06-03 9:21 Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).