linux-kernel - Re: [PATCH] ftrace: merge fix up

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Date:	Fri, 15 Aug 2008 18:54:19 +0200
From:	Ingo Molnar <mingo@...e.hu>
To:	Steven Rostedt <rostedt@...dmis.org>
Cc:	LKML <linux-kernel@...r.kernel.org>,
	Andrew Morton <akpm@...ux-foundation.org>
Subject: Re: [PATCH] ftrace: merge fix up


* Steven Rostedt <rostedt@...dmis.org> wrote:

> Somehow we got two calls to ftrace_init.
> 
> Signed-off-by: Steven Rostedt <srostedt@...hat.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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/