Messages in this thread | | | Date | Wed, 21 Mar 2018 15:37:15 +1100 | From | Stephen Rothwell <> | Subject | Re: linux-next: manual merge of the ftrace tree with the jc_docs tree |
| |
Hi all,
On Wed, 21 Mar 2018 15:31:27 +1100 Stephen Rothwell <sfr@canb.auug.org.au> 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 [unhandled content-type:application/pgp-signature] | |