The patch titled hrtimers-fix-a-complex-race-update has been added to the -mm tree. Its filename is hrtimers-fix-a-complex-race-update.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: hrtimers-fix-a-complex-race-update From: Salman Qazi <sqazi@xxxxxxxxxx> Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx> Cc: Ingo Molnar <mingo@xxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- kernel/hrtimer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -puN kernel/hrtimer.c~hrtimers-fix-a-complex-race-update kernel/hrtimer.c --- a/kernel/hrtimer.c~hrtimers-fix-a-complex-race-update +++ a/kernel/hrtimer.c @@ -1232,7 +1232,7 @@ static void __run_hrtimer(struct hrtimer enqueue_hrtimer(timer, base); } - BUG_ON(!(timer->state & HRTIMER_STATE_CALLBACK)); + WARN_ON_ONCE(!(timer->state & HRTIMER_STATE_CALLBACK)); timer->state &= ~HRTIMER_STATE_CALLBACK; } _ Patches currently in -mm which might be from sqazi@xxxxxxxxxx are hrtimers-fix-a-complex-race.patch hrtimers-fix-a-complex-race-update.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html