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

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

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 :-(

-- 
Cheers,
Stephen Rothwell