Re: [PATCH 5/7 REVISION v2] trace, RAS: Add eMCA trace event interface

[Steven Rostedt <rostedt@goodmis.org>]

On Fri, 20 Jun 2014 16:01:52 -0700
Tony Luck <tony.luck@gmail.com> wrote:

> On Thu, Jun 19, 2014 at 7:06 PM, Chen, Gong <gong.chen@linux.intel.com> wrote:
> >> Add trace interface to elaborate all H/W error related information.
> >>
> > So, Steven & Tony
> >
> > How to solve the dependency between different git tree? (One for trace, One
> > for RAS)
> 
> 1) Simplest (for me) - Steve pushes the trace change upstream now (at
> -rc1 now, -rc2 on Sunday - dodgy, but possible).
> 
> 2) Steve puts the change in a topic branch and publishes to
> kernel.org. I clone that, and add eMCA patches on top
> 
> 3) Steve signs off the patch, and I put it into a RAS branch (awkward
> for Steve in subsequent changes to trace touch same areas)
> 
> 4) Something else
> 

I was going to go with #2 but I have some patches that need to go soon
and since this patch only adds a new macro that no one uses, maybe I
can still slip it in.

-- Steve