linux-next: manual merge of the xfs tree with Linus' tree

Stephen Rothwell
2019-07-16T23:37:03Z

[-- Attachment #1: Type: text/plain, Size: 731 bytes --]

Hi all,

Today's linux-next merge of the xfs tree got a conflict in:

Documentation/admin-guide/index.rst

between commit:

66f2a122c68d ("docs: Move binderfs to admin-guide")

from Linus' tree and commit:

89b408a68b9d ("Documentation: filesystem: Convert xfs.txt to ReST")

from the xfs 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

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]