Hi Stephen, On Fri, Jan 17, 2014 at 02:30:35PM +1100, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the tip tree got a conflict in > drivers/clocksource/cadence_ttc_timer.c between commit c1dcc927dae0 > ("clocksource: cadence_ttc: Fix mutex taken inside interrupt context") > from Linus' tree and commit dfded00902d7 ("clocksource: > cadence_ttc_timer: Switch to sched_clock_register()") from the tip tree. > > I fixed it up (I think - see below) and can carry the fix as necessary > (no action is required). The fix is correct. Thanks, Sören -- 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