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@xxxxxxxxxxxxxxxx
Attachment:
pgpI1cS6ehrmm.pgp
Description: OpenPGP digital signature
