Re: [PATCH v8 1/8] ftrace: make CALLER_ADDRx macros more generic

From: Steven Rostedt
Date: Mon May 12 2014 - 12:05:43 EST


On Mon, 12 May 2014 16:58:11 +0100
Will Deacon <will.deacon@xxxxxxx> wrote:

> Akashi: did you get around to posting a new version of this patch? We can't
> take your arm64 patches until you get the core stuff merged...

I haven't seen any patches yet.

What I can also do is to create a separate branch based on mainline,
and just apply this change to the core. Then you could pull that branch
with a note to Linus that it is also in my tree with the common
ancestor.

If he pulls your work first, he'll only get that change from my tree,
and if he pulls mine first it doesn't matter as all the changes will be
there.

This is something he said at Kernel Summit that was normal procedure if
there's a change in one tree that another tree is dependent on.

-- Steve

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/