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

On Thu, 22 Mar 2018 09:21:08 +1100 Stephen Rothwell wrote: > > I can repost the whole thing as v10, or whatever makes sense here. > > Thanks, I assume that they apply on top of the jc_docs tree as well > (git://git.lwn.net/linux.git#docs-next). If so, then I can use

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

On Thu, 22 Mar 2018 09:21:08 +1100 Stephen Rothwell wrote: > > I can repost the whole thing as v10, or whatever makes sense here. > > Thanks, I assume that they apply on top of the jc_docs tree as well > (git://git.lwn.net/linux.git#docs-next). If so, then I can use them as > merge

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

Hi Stephen, On Thu, 2018-03-22 at 09:21 +1100, Stephen Rothwell wrote: > Hi Tom, > > On Wed, 21 Mar 2018 15:55:52 -0500 Tom Zanussi > wrote: > > > > Yeah, linux-next has changes to Documentation/trace/* that converts > > those files to .rst, which

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

Hi Stephen, On Thu, 2018-03-22 at 09:21 +1100, Stephen Rothwell wrote: > Hi Tom, > > On Wed, 21 Mar 2018 15:55:52 -0500 Tom Zanussi > wrote: > > > > Yeah, linux-next has changes to Documentation/trace/* that converts > > those files to .rst, which linux-trace/frace/core doesn't have. > > > >

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

Hi Tom, On Wed, 21 Mar 2018 15:55:52 -0500 Tom Zanussi wrote: > > Yeah, linux-next has changes to Documentation/trace/* that converts > those files to .rst, which linux-trace/frace/core doesn't have. > > I've rebased the inter-event patches to

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

Hi Tom, On Wed, 21 Mar 2018 15:55:52 -0500 Tom Zanussi wrote: > > Yeah, linux-next has changes to Documentation/trace/* that converts > those files to .rst, which linux-trace/frace/core doesn't have. > > I've rebased the inter-event patches to linux-next/next-20180320 to > reflect those

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

On Wed, 2018-03-21 at 09:15 -0400, Steven Rostedt wrote: > On Wed, 21 Mar 2018 15:37:15 +1100 > Stephen Rothwell wrote: > > > Hi all, > > > > On Wed, 21 Mar 2018 15:31:27 +1100 Stephen Rothwell > > wrote: > > > > > > Today's linux-next merge of

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

On Wed, 2018-03-21 at 09:15 -0400, Steven Rostedt wrote: > On Wed, 21 Mar 2018 15:37:15 +1100 > Stephen Rothwell wrote: > > > Hi all, > > > > On Wed, 21 Mar 2018 15:31:27 +1100 Stephen Rothwell > > wrote: > > > > > > Today's linux-next merge of the ftrace tree got a conflict in: > > > > > >

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

On Wed, 21 Mar 2018 15:37:15 +1100 Stephen Rothwell wrote: > Hi all, > > On Wed, 21 Mar 2018 15:31:27 +1100 Stephen Rothwell > wrote: > > > > Today's linux-next merge of the ftrace tree got a conflict in: > > > > Documentation/trace/ftrace.txt

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

On Wed, 21 Mar 2018 15:37:15 +1100 Stephen Rothwell wrote: > Hi all, > > On Wed, 21 Mar 2018 15:31:27 +1100 Stephen Rothwell > wrote: > > > > Today's linux-next merge of the ftrace tree got a conflict in: > > > > Documentation/trace/ftrace.txt > > (converted to

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

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

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

Hi Steven, Today's linux-next merge of the ftrace tree got a conflict in: Documentation/trace/ftrace.txt (converted to Documentation/trace/ftrace.rst) between commit: 1f198e22bc3a ("trace doc: convert trace/ftrace.txt to rst format") from the jc_docs tree and commit: 2c1ea60b195d

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

Hi Steven, Today's linux-next merge of the ftrace tree got a conflict in: Documentation/trace/ftrace.txt (converted to Documentation/trace/ftrace.rst) between commit: 1f198e22bc3a ("trace doc: convert trace/ftrace.txt to rst format") from the jc_docs tree and commit: 2c1ea60b195d