Re: [PATCH -tip 2/3] Tracing/ftrace: Adapt mmiotrace to the newtype of print_line

[Ingo Molnar]

* Frédéric Weisbecker <fweisbec@xxxxxxxxx> wrote:

> 2008/9/29 Ingo Molnar <mingo@xxxxxxx>:
> >
> > * Pekka Paalanen <pq@xxxxxx> wrote:
> >
> >> > +           return TRACE_TYPE_HANDLED;
> >> >     }
> >> >  }
> >>
> >> Otherwise, very good.
> >>
> >> As Ingo reverted the two earlier patches, you need to rebase these
> >> two. I'd like to see these in upstream. Let's handle the pipe closing
> >> bug in a different patch.
> >
> > good. Frederic, please just resubmit all fixes you have against
> > tip/master, with Pekka's Acked-by added. You can submit Pekka's patch as
> > well, so that it's a coherent series. The customary way for that is to
> > add in a From line as the first line of the changelog:
> >
> >  From: Pekka Paalanen <pq@xxxxxx>
> >
> > and add your signoff to the end of the changelog. This way Git will show
> > Pekka as the author and the path of the patch is well understood.
> >
> 
> Ok so... I resend my patches (without changes?) but I adapt them to
> latest -tip master?

yeah - resend any bits not yet in tip/master, and also add Pekka's 
Acked-by line to them where he said they are OK.

> And I add the pekka's patches (whit appropriate "from" line) with 
> them?

Correct. Also mark it v2 perhaps in the announcement.

when there's NACKs and discussion it's (much) easier to pick up a new 
series than picking out the bits from the discussion. That way the 
resubmission might be redundant in a large part, but it's a summary of 
your discussion with Pekka and the result of a consensus. I.e. not 
redundant in terms of a workflow step.

	Ingo
--
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/