From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Jonathan Corbet <corbet@lwn•net>, Al Viro <viro@ZenIV•linux.org.uk>
Cc: Linux Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
David Howells <dhowells@redhat•com>,
"Tobin C. Harding" <tobin@kernel•org>
Subject: Re: linux-next: manual merge of the jc_docs tree with the vfs tree
Date: Wed, 10 Jul 2019 10:10:44 +1000 [thread overview]
Message-ID: <20190710101044.499cc273@canb.auug.org.au> (raw)
In-Reply-To: <20190708115032.098e7302@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1966 bytes --]
Hi all,
On Mon, 8 Jul 2019 11:50:32 +1000 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> Today's linux-next merge of the jc_docs tree got a conflict in:
>
> Documentation/filesystems/vfs.txt
>
> between commit:
>
> 51eae7431ded ("vfs: Kill mount_single()")
>
> from the vfs tree and commit:
>
> af96c1e304f7 ("docs: filesystems: vfs: Convert vfs.txt to RST")
>
> from the jc_docs tree.
>
> I fixed it up (I removed the file and added the following merge fix patch)
> 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.
>
> From: Stephen Rothwell <sfr@canb•auug.org.au>
> Date: Mon, 8 Jul 2019 11:48:39 +1000
> Subject: [PATCH] docs: filesystems: vfs: update for "vfs: Kill mount_single()"
>
> Signed-off-by: Stephen Rothwell <sfr@canb•auug.org.au>
> ---
> Documentation/filesystems/vfs.rst | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/Documentation/filesystems/vfs.rst b/Documentation/filesystems/vfs.rst
> index 0f85ab21c2ca..a65ee69f02d1 100644
> --- a/Documentation/filesystems/vfs.rst
> +++ b/Documentation/filesystems/vfs.rst
> @@ -195,8 +195,8 @@ and provides a fill_super() callback instead. The generic variants are:
> ``mount_nodev``
> mount a filesystem that is not backed by a device
>
> -``mount_single``
> - mount a filesystem which shares the instance between all mounts
> +``vfs_get_super``
> + mount a filesystem with one of a number of superblock sharing options.
>
> A fill_super() callback implementation has the following arguments:
>
This is now a conflict between the vfs 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-07-10 0:10 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-08 1:50 linux-next: manual merge of the jc_docs tree with the vfs tree Stephen Rothwell
2019-07-10 0:10 ` 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=20190710101044.499cc273@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=corbet@lwn$(echo .)net \
--cc=dhowells@redhat$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=tobin@kernel$(echo .)org \
--cc=viro@ZenIV$(echo .)linux.org.uk \
/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