From: Ingo Molnar <mingo@elte.hu>
To: Steven Rostedt <rostedt@goodmis.org>
Cc: LKML <linux-kernel@vger.kernel.org>,
Andrew Morton <akpm@linux-foundation.org>
Subject: Re: [PATCH] ftrace: merge fix up
Date: Fri, 15 Aug 2008 18:54:19 +0200 [thread overview]
Message-ID: <20080815165419.GC29956@elte.hu> (raw)
In-Reply-To: <alpine.DEB.1.10.0808151244430.2188@gandalf.stny.rr.com>
* Steven Rostedt <rostedt@goodmis.org> wrote:
> Somehow we got two calls to ftrace_init.
>
> Signed-off-by: Steven Rostedt <srostedt@redhat.com>
> ---
> init/main.c | 2 --
> 1 file changed, 2 deletions(-)
>
> Index: linux-tip.git/init/main.c
> ===================================================================
> --- linux-tip.git.orig/init/main.c 2008-08-15 11:22:19.000000000 -0400
> +++ linux-tip.git/init/main.c 2008-08-15 12:43:41.000000000 -0400
> @@ -824,8 +824,6 @@ asmlinkage void __init start_kernel(void
>
> ftrace_init();
>
> - ftrace_init();
> -
ah, in tip/master - that's a conflict resolution artifact i suspect.
Thx.
Ingo
prev parent reply other threads:[~2008-08-15 16:54 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-08-15 16:45 Steven Rostedt
2008-08-15 16:54 ` Ingo Molnar [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20080815165419.GC29956@elte.hu \
--to=mingo@elte.hu \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=rostedt@goodmis.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®