linux-kernel - Re: [git pull] for both tip and powerpc

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 for Android: free password hash cracker in your pocket

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

Message-ID: <20090219111410.GM2354@elte.hu>
Date:	Thu, 19 Feb 2009 12:14:10 +0100
From:	Ingo Molnar <mingo@...e.hu>
To:	Steven Rostedt <rostedt@...dmis.org>
Cc:	Benjamin Herrenschmidt <benh@...nel.crashing.org>,
	LKML <linux-kernel@...r.kernel.org>,
	Andrew Morton <akpm@...ux-foundation.org>,
	Frédéric Weisbecker <fweisbec@...il.com>,
	linuxppc-dev@...abs.org
Subject: Re: [git pull] for both tip and powerpc


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

> Ingo and Benjamin,
> 
> As discussed, I made a branch called mainline/function-graph-tracer 
> based off of Linus's commit:
> 
> commit d2f8d7ee1a9b4650b4e43325b321801264f7c37a
> Author: Linus Torvalds <torvalds@...ux-foundation.org>
> Date:   Fri Feb 13 15:31:30 2009 -0800
> 
>     Linux 2.6.29-rc5
> 
> 
> and cherry picked the below change. I added Ingo's Acked-by as well. If 
> both of you pull this change in (assuming both trees are already based 
> off of Linus's 2.6.29-rc5) then there should be no conflicts when this 
> gets merged back to Linus's tree.
> 
> I will not touch this branch again, until it is officially in mainline.
> 
> Please pull the latest mainline/function-graph tree, which can be found at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace.git
> mainline/function-graph
> 
> 
> Steven Rostedt (1):
>       tracing/function-graph-tracer: make arch generic push pop functions
> 
> ----
>  arch/x86/include/asm/ftrace.h        |   25 -----------
>  arch/x86/kernel/dumpstack.c          |    1 +
>  arch/x86/kernel/ftrace.c             |   75 +---------------------------------
>  include/linux/ftrace.h               |   24 +++++++++++
>  kernel/trace/trace_functions_graph.c |   75 ++++++++++++++++++++++++++++++++++
>  5 files changed, 101 insertions(+), 99 deletions(-)

Pulled into tip:tracing/function-graph-tracer, thanks Steve!

	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/