Hi Kukjin,
Today's linux-next merge of the s5p tree got a conflict in
arch/arm/Kconfig between commit 9e84ed63dc71e13b62cea5ec6b0049260cca0b7a
("ARM: Partially revert "Auto calculate ZRELADDR and provide option for
exceptions"") from the arm-current tree and commit
03c1ebb0c4e84c4de78f522a73fe1e813b9a1fc1 ("ARM: S5P64X0: Update Kconfig
and Makefile") from the s5p tree.
I used the arm-current version, but there may be some fix required for
the s5p tree.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
Attachment:
pgpiC3NAddRF1.pgp
Description: PGP signature
