Hi all,
On Fri, 7 Dec 2018 11:53:40 +1100 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> 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 tree and commit:
>
> 7bbfd9ad8eb2 ("Documentation: convert path-lookup from markdown to resturctured text")
>
> from the jc_docs tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging. You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
>
> --
> Cheers,
> Stephen Rothwell
>
> diff --cc Documentation/filesystems/index.rst
> index 818390c32be6,ba921bdd5b06..000000000000
> --- a/Documentation/filesystems/index.rst
> +++ b/Documentation/filesystems/index.rst
> @@@ -360,13 -360,13 +360,24 @@@ encryption of files and directories
>
> fscrypt
>
> +Verity API
> +==========
> +
> +A library which filesystems can hook into to support transparent
> +authentication of read-only files.
> +
> +.. toctree::
> + :maxdepth: 2
> +
> + fsverity
> ++
> + Pathname lookup
> + ===============
> +
> + Pathname lookup in Linux is a complex beast; the document linked below
> + provides a comprehensive summary for those looking for the details.
> +
> + .. toctree::
> + :maxdepth: 2
> +
> + path-lookup.rst
This is now a conflict between the fscrypt tree and Linus' tree.
--
Cheers,
Stephen Rothwell
Attachment:
pgpXG5rRNlC6_.pgp
Description: OpenPGP digital signature
