Re: [GIT PULL 2/6] ARM: SoC cleanups for v4.4

[Linus Torvalds]

On Mon, Nov 9, 2015 at 7:33 PM, Olof Johansson <olof@xxxxxxxxx> wrote:
>
> Conflicts:
>
> OMAP timer code has a treewide fix vs code deletion conflict. Delete
> the code in HEAD, go with contents from branch.

That doesn't look right. It also needs the clocksource_of_init ->
clocksource_probe changes. The code was moved around rather than
deleted.

               Linus
--
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/