On 23.11.2015 10:22, Stephen Rothwell wrote:
> Hi Daniel,
>
> Today's linux-next merge of the clockevents tree got a conflict in:
>
> arch/arm/mach-exynos/Kconfig
>
> between commit:
>
> 23067d397616 ("ARM: EXYNOS: Switch to syscon reboot and poweroff")
>
> from the samsung-krzk tree and commit:
>
> b21f38ccbc1d ("clocksource/drivers/exynos_mct: Fix Kconfig and add COMPILE_TEST option")
>
> from the clockevents tree.
>
> OK, so these entries were sorted at one point for a reason :-(
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
Thanks, merge fix looks good. Indeed we should have put them in
alphabetical order.
Best regards,
Krzysztof
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
