Re: linux-next: manual merge of the tip tree with the tree

[Ralf Baechle]

On Fri, May 13, 2011 at 01:10:44PM +1000, Stephen Rothwell wrote:

> Hi all,
> 
> Today's linux-next merge of the tip tree got a conflict in
> arch/mips/kernel/i8253.c between commit 2b9b7cd782a5 ("clocksource:
> convert mips to generic i8253 clocksource") from the arm tree and commit
> 75c4fd8c7862 ("mips: convert to clocksource_register_hz/khz") from the
> tip tree.
> 
> The former seems to supercede the latter, so I used the former.

That's the right resolution, thanks!

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