Re: linux-next: manual merge of the jc_docs tree with the vfs tree
From: Stephen Rothwell
Date: Tue Jul 09 2019 - 20:10:53 EST
On Mon, 8 Jul 2019 11:50:32 +1000 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
> Today's linux-next merge of the jc_docs tree got a conflict in:
> 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@xxxxxxxxxxxxxxxx>
> 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@xxxxxxxxxxxxxxxx>
> 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 a filesystem that is not backed by a device
> - mount a filesystem which shares the instance between all mounts
> + 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.
Description: OpenPGP digital signature