The patch titled x86_64: cleanup tsc.c merge artifact has been removed from the -mm tree. Its filename was x86_64-cleanup-tscc-merge-artifact.patch This patch was dropped because it was merged into mainline or a subsystem tree ------------------------------------------------------ Subject: x86_64: cleanup tsc.c merge artifact From: Thomas Gleixner <tglx@xxxxxxxxxxxxx> tsc_unstable is declared twice. Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx> Cc: Andi Kleen <ak@xxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- arch/x86_64/kernel/tsc.c | 2 -- 1 file changed, 2 deletions(-) diff -puN arch/x86_64/kernel/tsc.c~x86_64-cleanup-tscc-merge-artifact arch/x86_64/kernel/tsc.c --- a/arch/x86_64/kernel/tsc.c~x86_64-cleanup-tscc-merge-artifact +++ a/arch/x86_64/kernel/tsc.c @@ -118,8 +118,6 @@ core_initcall(cpufreq_tsc); #endif -static int tsc_unstable = 0; - /* * Make an educated guess if the TSC is trustworthy and synchronized * over all CPUs. _ Patches currently in -mm which might be from tglx@xxxxxxxxxxxxx are origin.patch git-acpi.patch acpi-move-timer-broadcast-and-pmtimer-access-before-c3-arbiter-shutdown.patch nohz-fix-nohz-x86-dyntick-idle-handling.patch x86_64-hpet-restore-vread.patch x86_64-restore-restore-nohpet-cmdline.patch x86_64-block-irq-balancing-for-timer.patch x86_64-prep-idle-loop-for-dynticks.patch x86_64-enable-high-resolution-timers-and-dynticks.patch x86_64-dynticks-disable-hpet_id_legsup-hpets.patch geode-mfgpt-clock-event-device-support.patch time-simplify-smp_call_function_single-call-sequence.patch kernel-time-clocksourcec-use-list_for_each_entry-instead-of-list_for_each.patch whitespace-fixes-time-syscalls.patch whitespace-fixes-interval-timers.patch whitespace-fixes-system-timers.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