From mboxrd@z Thu Jan 1 00:00:00 1970 From: akpm@linux-foundation.org Subject: - kconfiginstrumentation-sourcing-missing-on-i386-and-x86_64.patch removed from -mm tree Date: Wed, 24 Oct 2007 14:41:11 -0700 Message-ID: <200710242141.l9OLfBYV013930@imap1.linux-foundation.org> Reply-To: linux-kernel@vger.kernel.org Return-path: Received: from smtp2.linux-foundation.org ([207.189.120.14]:41966 "EHLO smtp2.linux-foundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757901AbXJXVlm (ORCPT ); Wed, 24 Oct 2007 17:41:42 -0400 Sender: mm-commits-owner@vger.kernel.org List-Id: mm-commits@vger.kernel.org To: mathieu.desnoyers@polymtl.ca, mingo@elte.hu, tglx@linutronix.de, mm-commits@vger.kernel.org The patch titled Kconfig.instrumentation sourcing missing on i386 and x86_64 has been removed from the -mm tree. Its filename was kconfiginstrumentation-sourcing-missing-on-i386-and-x86_64.patch This patch was dropped because it was merged into mainline or a subsystem tree ------------------------------------------------------ Subject: Kconfig.instrumentation sourcing missing on i386 and x86_64 From: Mathieu Desnoyers The same happened on i386 and x86_64. I guess some bits from the combine-instrumentation-menus-in-kernel-kconfiginstrumentation.patch were lost during the mainline merge. Signed-off-by: Mathieu Desnoyers Cc: Thomas Gleixner Cc: Ingo Molnar Signed-off-by: Andrew Morton --- arch/i386/Kconfig | 2 ++ arch/x86_64/Kconfig | 2 ++ 2 files changed, 4 insertions(+) diff -puN arch/i386/Kconfig~kconfiginstrumentation-sourcing-missing-on-i386-and-x86_64 arch/i386/Kconfig --- a/arch/i386/Kconfig~kconfiginstrumentation-sourcing-missing-on-i386-and-x86_64 +++ a/arch/i386/Kconfig @@ -1258,6 +1258,8 @@ source "drivers/Kconfig" source "fs/Kconfig" +source "kernel/Kconfig.instrumentation" + source "arch/i386/Kconfig.debug" source "security/Kconfig" diff -puN arch/x86_64/Kconfig~kconfiginstrumentation-sourcing-missing-on-i386-and-x86_64 arch/x86_64/Kconfig --- a/arch/x86_64/Kconfig~kconfiginstrumentation-sourcing-missing-on-i386-and-x86_64 +++ a/arch/x86_64/Kconfig @@ -833,6 +833,8 @@ source "drivers/firmware/Kconfig" source fs/Kconfig +source "kernel/Kconfig.instrumentation" + source "arch/x86_64/Kconfig.debug" source "security/Kconfig" _ Patches currently in -mm which might be from mathieu.desnoyers@polymtl.ca are