On Wed, 21 Mar 2018 15:37:15 +1100
Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
> Hi all,
>
> On Wed, 21 Mar 2018 15:31:27 +1100 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> 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
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
