* Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
> Hi all,
>
> Today's linux-next merge of the timers tree got a conflict in
> kernel/time/tick-sched.c between commit
> c34bec5a44e9486597d78e7a686b2f9088a0564c ("") from Linus' tree and commit
> cc584b213f252bf698849cf4be2377cd3ec7501a ("hrtimer: convert kernel/* to
> the new hrtimer apis") from the timers tree.
>
> The former moved the code that the latter modified. I fixed it up (see
> below).
thanks Stephen!
I have also pushed out a new tip/auto-timers-next tree which is
conflict-free with latest -git. (it is the same)
Ingo
--
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
