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

2017-07-02 Thread Stephen Rothwell
Hi all, With the merge window opening, just a reminder that this conflict still exists. On Wed, 14 Jun 2017 14:04:16 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the char-misc tree got a conflict in: > > Documentation/DocBook/w1.tmpl > > between commit: > > b4c1064a76e7

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

2017-06-13 Thread Greg KH
On Wed, Jun 14, 2017 at 02:04:16PM +1000, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the char-misc tree got a conflict in: > > Documentation/DocBook/w1.tmpl > > between commit: > > b4c1064a76e7 ("docs-rst: convert w1 book to ReST") > > from the jc_docs tree and commi

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

2017-06-13 Thread Greg KH
On Tue, Jun 13, 2017 at 04:23:41PM +1000, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the char-misc tree got a conflict in: > > Documentation/admin-guide/index.rst > > between commit: > > 504f231cda56 ("doc: ReSTify and split LSM.txt") > > from the jc_docs tree and co