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

Hi all, On Fri, 7 Dec 2018 11:53:40 +1100 Stephen Rothwell wrote: > > Hi all, > > Today's linux-next merge of the jc_docs tree got a conflict in: > > Documentation/filesystems/index.rst > > between commit: > > 1b71a6809f96 ("fs-verity: add a documentation file") > > from the fscrypt tre

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

On Fri, 7 Dec 2018 11:53:40 +1100 Stephen Rothwell wrote: > Today's linux-next merge of the jc_docs tree got a conflict in: > > Documentation/filesystems/index.rst > > between commit: > > 1b71a6809f96 ("fs-verity: add a documentation file") > > from the fscrypt tree and commit: > > 7bb