[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <18723.64019.500474.586671@cargo.ozlabs.ibm.com>
Date: Wed, 19 Nov 2008 22:35:47 +1100
From: Paul Mackerras <paulus@...ba.org>
To: Ingo Molnar <mingo@...e.hu>
Cc: Steven Rostedt <rostedt@...dmis.org>,
LKML <linux-kernel@...r.kernel.org>,
Andrew Morton <akpm@...ux-foundation.org>,
Benjamin Herrenschmidt <benh@...nel.crashing.org>,
linuxppc-dev@...abs.org
Subject: Re: [PATCH 0/7] Porting dynmaic ftrace to PowerPC
Ingo Molnar writes:
> and it's all in flux (we are in the middle of the development cycle),
> so i dont think it would be a good idea for you to pull those bits
> into the powerpc tree.
Quite. OK, it does sound like this stuff needs to live in your tree
for now, and from the diffstat it doesn't look like there is any
conflict with stuff in my tree yet.
> Maybe Steve could do the following trick: create a Linus -git based
> branch that uses the new APIs but marks ppc's ftrace as "depends 0" in
> the powerpc Kconfig. (the new ftrace.c wont build)
>
> You could pull that tree into the powerpc tree and everything should
> still work fine in PPC - sans ftrace.
Sounds like a reasonable idea, except that I think I'll delay pulling
that branch into my tree until I need to in order to resolve a
conflict - at least as far as my exported branches are concerned.
> In tip/tracing we'd merge it too (these commits will never be
> rebased),
I do want to see the patches in their final form and have the
opportunity to give an acked-by before you declare the branch frozen.
Apart from that, sounds good.
Paul.
--
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/
Powered by blists - more mailing lists