The patch titled clocksource: remove redundant code has been added to the -mm tree. Its filename is clocksource-remove-redundant-code.patch *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ Subject: clocksource: remove redundant code From: Li Zefan <lizf@xxxxxxxxxxxxxx> Flag CLOCK_SOURCE_WATCHDOG is cleared twice. Note clocksource_change_rating() won't do anyting with the cs flag. Signed-off-by: Li Zefan <lizf@xxxxxxxxxxxxxx> Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx> Cc: Ingo Molnar <mingo@xxxxxxx> Cc: john stultz <johnstul@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- kernel/time/clocksource.c | 1 - 1 file changed, 1 deletion(-) diff -puN kernel/time/clocksource.c~clocksource-remove-redundant-code kernel/time/clocksource.c --- a/kernel/time/clocksource.c~clocksource-remove-redundant-code +++ a/kernel/time/clocksource.c @@ -91,7 +91,6 @@ static void clocksource_ratewd(struct cl cs->name, delta); cs->flags &= ~(CLOCK_SOURCE_VALID_FOR_HRES | CLOCK_SOURCE_WATCHDOG); clocksource_change_rating(cs, 0); - cs->flags &= ~CLOCK_SOURCE_WATCHDOG; list_del(&cs->wd_list); } _ Patches currently in -mm which might be from lizf@xxxxxxxxxxxxxx are arm-fix-memset-size-error.patch git-hid.patch ia64-efi-make-full-use-of-macro-efi_md_size.patch clocksource-remove-redundant-code.patch clockevent-simplify-list-operations.patch timekeeping-rename-timekeeping_is_continuous-to-timekeeping_valid_for_hres.patch time-fix-typo-in-comments.patch time-delete-comments-that-refer-to-noexistent-symbols.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