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

From: Stephen Warren
Date: Mon Mar 18 2013 - 11:23:46 EST

On 03/17/2013 10:31 PM, Stephen Rothwell wrote:
> Hi all,
> Today's linux-next merge of the tegra tree got a conflict in
> drivers/clocksource/tegra20_timer.c between commit 1d16cfb3aeba
> ("clocksource: tegra20: use the device_node pointer passed to
> init") from the arm-soc tree and commit 6f88fb8af6c6 ("clocksource:
> tegra: move to of_clk_get") from the tegra tree.
> I fixed it up (see below) and can carry the fix as necessary (no
> action is required).

Thanks. This resolution looks fine.

Arnd/Olof, do you want me to rebase the Tegra branch onto some arm-soc
branch to resolve this conflict, or are you happy to simply resolve it
as below when pulling the Tegra branches into arm-soc for 3.10?
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at
Please read the FAQ at