On Mon, 19 Oct 2015 11:59:08 +1100
Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
Hi Stephen,
> Hi Rafael,
>
> Today's linux-next merge of the pm tree got a conflict in:
>
> arch/arm/mach-omap2/timer.c
>
> between commits:
>
> 3afbb9afe2c4 ("arm: omap2: timer: move realtime_counter_init() around")
> 9c46ffcd5214 ("arm: omap2: timer: always call clocksource_of_init() when DT")
>
> from the omap tree and commit:
>
> 3722ed2380ad ("clocksource: cosmetic: Drop OF 'dependency' from symbols")
>
> from the pm tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
>
[...]
Looks great, thanks!
M.
--
Jazz is not dead. It just smells funny.
--
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
