Subject: Re: linux-next: manual merge of the ftrace tree with the jc_docs tree

From: Steven Rostedt <[email-masked]>
Date: Wed, 21 Mar 2018 09:15:54 -0400

On Wed, 21 Mar 2018 15:37:15 +1100
Stephen Rothwell <[email-masked]> wrote:

> Hi all,
> 
> On Wed, 21 Mar 2018 15:31:27 +1100 Stephen Rothwell <[email-masked]> wrote:
> >
> > Today's linux-next merge of the ftrace tree got a conflict in:
> > 
> >   Documentation/trace/ftrace.txt
> >   (converted to Documentation/trace/ftrace.rst)  
> 
> There was another conflict involving
> 
>   Documentation/trace/events.{txt,rst}
> 
> Unfortunately, I accidentally deleted the report email before sending
> it :-(
> 

Ug yeah. All the histogram code was ripped out of the events.txt and
a new file was created called histogram.txt. I'm guessing that should
also be converted into an .rst file.

-- Steve