From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Theodore Ts'o <tytso@mit•edu>
Cc: Jonathan Corbet <corbet@lwn•net>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
NeilBrown <neilb@suse•com>, Eric Biggers <ebiggers@google•com>
Subject: Re: linux-next: manual merge of the jc_docs tree with the fscrypt tree
Date: Wed, 2 Jan 2019 11:37:02 +1100 [thread overview]
Message-ID: <20190102113702.6e8888b4@canb.auug.org.au> (raw)
In-Reply-To: <20181207115340.2465a854@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1798 bytes --]
Hi all,
On Fri, 7 Dec 2018 11:53:40 +1100 Stephen Rothwell <sfr@canb•auug.org.au> 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 #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
prev parent reply other threads:[~2019-01-02 0:37 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-07 0:53 linux-next: manual merge of the jc_docs tree with the fscrypt tree Stephen Rothwell
2018-12-07 7:08 ` Jonathan Corbet
2019-01-02 0:37 ` Stephen Rothwell [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190102113702.6e8888b4@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=corbet@lwn$(echo .)net \
--cc=ebiggers@google$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=neilb@suse$(echo .)com \
--cc=tytso@mit$(echo .)edu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox