Re: linux-next: manual merge of the samsung-krzk tree with the arm-soc tree

From: Krzysztof Kozlowski
Date: Fri Sep 16 2016 - 04:51:13 EST

On 09/05/2016 03:19 AM, Stephen Rothwell wrote:
> Hi Krzysztof,
> Today's linux-next merge of the samsung-krzk tree got a conflict in:
> arch/arm64/boot/dts/exynos/exynos7.dtsi
> between commit:
> 585dcacac6bb ("arm64: dts: Fix broken architected timer interrupt trigger")
> from the arm-soc tree and commit:
> 36d1c9cd07cd ("arm64: dts: exynos: Use human-friendly symbols for timer interrupt flags")
> from the samsung-krzk tree.
> I fixed it up (I *think* - see below) and can carry the fix as
> necessary. This is now fixed as far as linux-next is concerned, but any
> non trivial conflicts should be mentioned to your upstream maintainer
> when your tree is submitted for merging. You may also want to consider
> cooperating with the maintainer of the conflicting tree to minimise any
> particularly complex conflicts.

The fix is correct, for the record:
Reviewed-by: Krzysztof Kozlowski <k.kozlowski@xxxxxxxxxxx>

Merge conflict was (unfortunately) expected. In general, the
multiple-platform-at-once patches are conflict prone. Especially in this
case, Marc's patch ("arm64: dts: Fix broken architected...") could be
split per architecture.

Best regards,