RE: linux-next: manual merge of the s5p tree with the arm-current tree

[Kukjin Kim]

Stephen Rothwell wrote:
> 
> Hi Kukjin,
> 
Hi :-)

> 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.
> 
Oh, ok...thanks for your information.

> I used the arm-current version, but there may be some fix required for
> the s5p tree.
> 
Sure, I fixed my tree for it.

Have a nice weekend ;-)

Thanks.

Best regards,
Kgene.
--
Kukjin Kim <kgene.kim@xxxxxxxxxxx>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/